[kernel] r16702 - in dists/trunk/linux-2.6/debian: . config/alpha config/hppa config/ia64 config/kernelarch-x86 config/powerpc

[Ben Hutchings]

Author: benh
Date: Sun Dec 12 03:54:31 2010
New Revision: 16702

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

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/hppa/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Dec 12 03:32:25 2010	(r16701)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec 12 03:54:31 2010	(r16702)
@@ -3,6 +3,8 @@
   [ 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 at decadent.org.uk>  Sat, 11 Dec 2010 21:21:10 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Sun Dec 12 03:32:25 2010	(r16701)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Sun Dec 12 03:54:31 2010	(r16702)
@@ -290,7 +290,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	Sun Dec 12 03:32:25 2010	(r16701)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Sun Dec 12 03:54:31 2010	(r16702)
@@ -96,7 +96,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Sun Dec 12 03:32:25 2010	(r16701)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Sun Dec 12 03:54:31 2010	(r16702)
@@ -249,7 +249,7 @@
 ##
 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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Dec 12 03:32:25 2010	(r16701)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Dec 12 03:54:31 2010	(r16702)
@@ -170,6 +170,7 @@
 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_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

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Sun Dec 12 03:32:25 2010	(r16701)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Sun Dec 12 03:54:31 2010	(r16702)
@@ -79,6 +79,11 @@
 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_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