[kernel] r12850 - in dists/trunk/linux-2.6/debian: . config/alpha config/amd64 config/arm config/hppa config/i386 config/ia64 config/m68k config/powerpc config/sparc

Martin Michlmayr tbm at alioth.debian.org
Wed Feb 18 17:08:43 UTC 2009 

Author: tbm
Date: Wed Feb 18 17:08:42 2009
New Revision: 12850

Log:
CONFIG_BLK_DEV_IDE was renamed to CONFIG_IDE_GD upstream.  Update all
configs accordingly.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/arm/config.iop32x
   dists/trunk/linux-2.6/debian/config/hppa/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/m68k/config.amiga
   dists/trunk/linux-2.6/debian/config/m68k/config.atari
   dists/trunk/linux-2.6/debian/config/m68k/config.mac
   dists/trunk/linux-2.6/debian/config/m68k/config.q40
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Feb 18 17:08:42 2009
@@ -1,9 +1,8 @@
 linux-2.6 (2.6.28-2) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
-  * [arm/footbridge, mips*/4kc-malta, mips*/5kc-malta, mips*/sb1-bcm91250a,
-     mips*/sb1a-bcm91480b, mipsel/r5k-cobalt] CONFIG_BLK_DEV_IDE was
-     renamed to CONFIG_IDE_GD upstream.
+  * CONFIG_BLK_DEV_IDE was renamed to CONFIG_IDE_GD upstream.  Update all
+    configs accordingly.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Wed, 18 Feb 2009 18:01:40 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Wed Feb 18 17:08:42 2009
@@ -302,10 +302,9 @@
 ##
 CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE_GD=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed Feb 18 17:08:42 2009
@@ -486,10 +486,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE_GD=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m

Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x	Wed Feb 18 17:08:42 2009
@@ -243,10 +243,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE_GD=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Wed Feb 18 17:08:42 2009
@@ -102,10 +102,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE_GD=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed Feb 18 17:08:42 2009
@@ -578,10 +578,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE_GD=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Wed Feb 18 17:08:42 2009
@@ -253,8 +253,8 @@
 ##
 CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=m
-CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_IDE_GD=m
+CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Wed Feb 18 17:08:42 2009
@@ -49,10 +49,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=y
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed Feb 18 17:08:42 2009
@@ -46,9 +46,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDE_GD_ATA=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed Feb 18 17:08:42 2009
@@ -30,10 +30,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=y
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.q40	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.q40	Wed Feb 18 17:08:42 2009
@@ -21,10 +21,9 @@
 # CONFIG_PNP is not set
 # CONFIG_BLK_DEV_FD is not set
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=y
 CONFIG_BLK_DEV_IDECD=y
 # disable IDETAPE, causes ICE
 # CONFIG_BLK_DEV_IDETAPE is not set

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Feb 18 17:08:42 2009
@@ -274,10 +274,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=y
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Wed Feb 18 17:08:42 2009
@@ -128,10 +128,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD_ATA=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Wed Feb 18 17:08:42 2009
@@ -130,9 +130,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE_GD=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_IDE_GD_ATA=m
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m

More information about the Kernel-svn-changes mailing list