aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-10-12 17:24:09 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-10-12 18:44:17 -0400
commit58273e553d3d2a6b1a302f1b79eb263190554345 (patch)
tree396dc6781796ebc89e9964cf05db4c2fd582bbc5 /arch/arm/Kconfig
parent1e621a8e3752367d4aae78a8ab00a18fb2793f34 (diff)
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-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"
997 997
998source "drivers/block/Kconfig" 998source "drivers/block/Kconfig"
999 999
1000# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
1001
1002source "drivers/misc/Kconfig"
1003
1000if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \ 1004if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
1001 || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \ 1005 || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
1002 || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \ 1006 || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
@@ -1032,16 +1036,16 @@ source "drivers/spi/Kconfig"
1032 1036
1033source "drivers/w1/Kconfig" 1037source "drivers/w1/Kconfig"
1034 1038
1039source "drivers/power/Kconfig"
1040
1035source "drivers/hwmon/Kconfig" 1041source "drivers/hwmon/Kconfig"
1036 1042
1037#source "drivers/l3/Kconfig" 1043source "drivers/ssb/Kconfig"
1038 1044
1039source "drivers/misc/Kconfig" 1045#source "drivers/l3/Kconfig"
1040 1046
1041source "drivers/mfd/Kconfig" 1047source "drivers/mfd/Kconfig"
1042 1048
1043source "drivers/leds/Kconfig"
1044
1045source "drivers/media/Kconfig" 1049source "drivers/media/Kconfig"
1046 1050
1047source "drivers/video/Kconfig" 1051source "drivers/video/Kconfig"
@@ -1054,6 +1058,8 @@ source "drivers/usb/Kconfig"
1054 1058
1055source "drivers/mmc/Kconfig" 1059source "drivers/mmc/Kconfig"
1056 1060
1061source "drivers/leds/Kconfig"
1062
1057source "drivers/rtc/Kconfig" 1063source "drivers/rtc/Kconfig"
1058 1064
1059source "drivers/dma/Kconfig" 1065source "drivers/dma/Kconfig"