diff --git a/debian/changelog b/debian/changelog
index 56fe652bd..89f657c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@cyrius.com>  Wed, 18 Feb 2009 18:01:40 +0100
+
 linux-2.6 (2.6.28-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge
index 3cb8243ba..0511bee8a 100644
--- a/debian/config/arm/config.footbridge
+++ b/debian/config/arm/config.footbridge
@@ -307,10 +307,9 @@ CONFIG_SENSORS_MAX6875=m
 ## 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
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index 425f8e158..8b63d9248 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -380,10 +380,9 @@ CONFIG_SENSORS_MAX6875=m
 ##
 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
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 6b29172be..747509591 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -378,10 +378,9 @@ CONFIG_SENSORS_MAX6875=m
 ##
 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
diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a
index c737556e6..fe1306dd0 100644
--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/mips/config.sb1-bcm91250a
@@ -292,10 +292,9 @@ CONFIG_I2C_STUB=m
 ## 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
diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b
index ea9643e89..cd748169a 100644
--- a/debian/config/mips/config.sb1a-bcm91480b
+++ b/debian/config/mips/config.sb1a-bcm91480b
@@ -293,10 +293,9 @@ CONFIG_I2C_STUB=m
 ## 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
diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta
index ce1022e79..9c6caa62c 100644
--- a/debian/config/mipsel/config.4kc-malta
+++ b/debian/config/mipsel/config.4kc-malta
@@ -379,10 +379,9 @@ CONFIG_SENSORS_MAX6875=m
 ##
 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
diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta
index e5b18ff2c..26c296645 100644
--- a/debian/config/mipsel/config.5kc-malta
+++ b/debian/config/mipsel/config.5kc-malta
@@ -377,10 +377,9 @@ CONFIG_SENSORS_MAX6875=m
 ##
 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
diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt
index c530ee18c..4343dd131 100644
--- a/debian/config/mipsel/config.r5k-cobalt
+++ b/debian/config/mipsel/config.r5k-cobalt
@@ -166,10 +166,9 @@ CONFIG_VT_CONSOLE=y
 ## 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
diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a
index 32a96c0ec..5f328c968 100644
--- a/debian/config/mipsel/config.sb1-bcm91250a
+++ b/debian/config/mipsel/config.sb1-bcm91250a
@@ -292,10 +292,9 @@ CONFIG_I2C_STUB=m
 ## 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
diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b
index e266fb2ee..2e7850de2 100644
--- a/debian/config/mipsel/config.sb1a-bcm91480b
+++ b/debian/config/mipsel/config.sb1a-bcm91480b
@@ -292,10 +292,9 @@ CONFIG_I2C_STUB=m
 ## 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