[PATCH] ARM: Convert to use shared "Device Drivers" menu

[Rodolfo Giometti <giometti@enneenne.com>]

ARM: Convert to use shared "Device Drivers" menu.

Signed-off-by: Rodolfo Giometti <giometti@enneenne.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6783c2e..a2ca665 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -885,84 +885,7 @@ endmenu
 
 source "net/Kconfig"
 
-menu "Device Drivers"
-
-source "drivers/base/Kconfig"
-
-source "drivers/connector/Kconfig"
-
-if ALIGNMENT_TRAP || !CPU_CP15_MMU
-source "drivers/mtd/Kconfig"
-endif
-
-source "drivers/parport/Kconfig"
-
-source "drivers/pnp/Kconfig"
-
-source "drivers/block/Kconfig"
-
-source "drivers/acorn/block/Kconfig"
-
-if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
-	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
-	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
-	|| ARCH_IXP23XX
-source "drivers/ide/Kconfig"
-endif
-
-source "drivers/scsi/Kconfig"
-
-source "drivers/ata/Kconfig"
-
-source "drivers/md/Kconfig"
-
-source "drivers/message/fusion/Kconfig"
-
-source "drivers/ieee1394/Kconfig"
-
-source "drivers/message/i2o/Kconfig"
-
-source "drivers/net/Kconfig"
-
-source "drivers/isdn/Kconfig"
-
-# input before char - char/joystick depends on it. As does USB.
-
-source "drivers/input/Kconfig"
-
-source "drivers/char/Kconfig"
-
-source "drivers/i2c/Kconfig"
-
-source "drivers/spi/Kconfig"
-
-source "drivers/w1/Kconfig"
-
-source "drivers/hwmon/Kconfig"
-
-#source "drivers/l3/Kconfig"
-
-source "drivers/misc/Kconfig"
-
-source "drivers/mfd/Kconfig"
-
-source "drivers/leds/Kconfig"
-
-source "drivers/media/Kconfig"
-
-source "drivers/video/Kconfig"
-
-source "sound/Kconfig"
-
-source "drivers/hid/Kconfig"
-
-source "drivers/usb/Kconfig"
-
-source "drivers/mmc/Kconfig"
-
-source "drivers/rtc/Kconfig"
-
-endmenu
+source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
diff --git a/drivers/Kconfig b/drivers/Kconfig
index e7da9fa..23c1f57 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -6,7 +6,9 @@ source "drivers/base/Kconfig"
 
 source "drivers/connector/Kconfig"
 
+if ! ARM || ( ALIGNMENT_TRAP || !CPU_CP15_MMU )
 source "drivers/mtd/Kconfig"
+endif
 
 source "drivers/parport/Kconfig"
 
@@ -18,7 +20,14 @@ source "drivers/block/Kconfig"
 
 source "drivers/misc/Kconfig"
 
+source "drivers/acorn/block/Kconfig"
+
+if ! ARM || ( PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || \
+              ARCH_IXP4XX || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || \
+	      ARCH_RPC || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || \
+	      FOOTBRIDGE || ARCH_IXP23XX )
 source "drivers/ide/Kconfig"
+endif
 
 source "drivers/scsi/Kconfig"