[kernel] r12849 - in dists/trunk/linux-2.6/debian: . config/arm config/mips config/mipsel

Martin Michlmayr tbm at alioth.debian.org
Wed Feb 18 17:03:53 UTC 2009 

Author: tbm
Date: Wed Feb 18 17:03:50 2009
New Revision: 12849

Log:
CONFIG_BLK_DEV_IDE was renamed to CONFIG_IDE_GD upstream.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b

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:03:50 2009
@@ -1,3 +1,12 @@
+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.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Wed, 18 Feb 2009 18:01:40 +0100
+
 linux-2.6 (2.6.28-1) unstable; urgency=low
 
   * New upstream release

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed Feb 18 17:03:50 2009
@@ -307,10 +307,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=y
+CONFIG_IDE_GD_ATA=y
 # CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed Feb 18 17:03:50 2009
@@ -380,10 +380,9 @@
 ##
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
-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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed Feb 18 17:03:50 2009
@@ -378,10 +378,9 @@
 ##
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
-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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Wed Feb 18 17:03:50 2009
@@ -292,10 +292,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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Wed Feb 18 17:03:50 2009
@@ -293,10 +293,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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Wed Feb 18 17:03:50 2009
@@ -379,10 +379,9 @@
 ##
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
-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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Wed Feb 18 17:03:50 2009
@@ -377,10 +377,9 @@
 ##
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
-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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed Feb 18 17:03:50 2009
@@ -166,10 +166,9 @@
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Wed Feb 18 17:03:50 2009
@@ -292,10 +292,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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Wed Feb 18 17:03:50 2009
@@ -292,10 +292,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=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m

More information about the Kernel-svn-changes mailing list