summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-10-13 01:24:09 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-10-13 02:44:17 +0400
commit58273e553d3d2a6b1a302f1b79eb263190554345 (patch)
tree396dc6781796ebc89e9964cf05db4c2fd582bbc5
parent1e621a8e3752367d4aae78a8ab00a18fb2793f34 (diff)
downloadlinux-58273e553d3d2a6b1a302f1b79eb263190554345.tar.xz
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/Kconfig14
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b984b120999..fcd1d8f95a21 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -997,6 +997,10 @@ source "drivers/pnp/Kconfig"
source "drivers/block/Kconfig"
+# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
+
+source "drivers/misc/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 \
@@ -1032,16 +1036,16 @@ source "drivers/spi/Kconfig"
source "drivers/w1/Kconfig"
+source "drivers/power/Kconfig"
+
source "drivers/hwmon/Kconfig"
-#source "drivers/l3/Kconfig"
+source "drivers/ssb/Kconfig"
-source "drivers/misc/Kconfig"
+#source "drivers/l3/Kconfig"
source "drivers/mfd/Kconfig"
-source "drivers/leds/Kconfig"
-
source "drivers/media/Kconfig"
source "drivers/video/Kconfig"
@@ -1054,6 +1058,8 @@ source "drivers/usb/Kconfig"
source "drivers/mmc/Kconfig"
+source "drivers/leds/Kconfig"
+
source "drivers/rtc/Kconfig"
source "drivers/dma/Kconfig"