[powerpc,x86] Enable PATA_PCMCIA (Closes: #606324). Disable BLK_DEV_IDECS everywhere.

svn path=/dists/trunk/linux-2.6/; revision=16702

6 files changed, 13 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index d748d4a99a87..f5b572481b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ linux-2.6 (2.6.37~rc5-1~experimental.4) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * debian/copyright: Add explanation of indirect linking of perf to
     OpenSSL (Closes: #606520)
+  * [powerpc,x86] Enable PATA_PCMCIA (Closes: #606324)
+  * Disable BLK_DEV_IDECS
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 11 Dec 2010 21:21:10 +0000
 
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index c5f43b6aad07..f0ec88aee481 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -290,7 +290,7 @@ CONFIG_SCx200_ACB=m
 CONFIG_IDE=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_IDE_GD=m
-CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_IDE_GENERIC=m
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index bb37852fe9dc..2ef583d86367 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -96,7 +96,7 @@ CONFIG_USB_MOUSE=m
 CONFIG_IDE=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_IDE_GD=m
-CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_IDE_GENERIC=m
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 31d0d475861b..ec2542fe8279 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -249,7 +249,7 @@ CONFIG_SCx200_ACB=m
 ##
 CONFIG_IDE=m
 CONFIG_IDE_GD=m
-CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_IDE_GENERIC=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index e6ada4009b5c..9574a390f8bd 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -170,6 +170,7 @@ CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
+CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_RZ1000=m
 CONFIG_PATA_SC1200=m
@@ -505,7 +506,7 @@ CONFIG_SCx200_ACB=m
 CONFIG_IDE=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_IDE_GD=m
-CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 # CONFIG_BLK_DEV_IDEACPI is not set
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 49b1e48f6719..abb457cf3b55 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -79,6 +79,11 @@ CONFIG_PREP_RESIDUAL=y
 CONFIG_PROC_PREPRESIDUAL=y
 
 ##
+## file: drivers/ata/config
+##
+CONFIG_PATA_PCMCIA=m
+
+##
 ## file: drivers/atm/Kconfig
 ##
 CONFIG_ATM_DRIVERS=y
@@ -271,7 +276,7 @@ CONFIG_IDE=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_IDE_GD=y
 CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 # CONFIG_IDE_GENERIC is not set