From 9505e4052307c7339bd56d26174614f1219bad03 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 12 Oct 2007 22:24:09 +0100
Subject: [PATCH] --- yaml --- r: 69495 b: refs/heads/master c:
 58273e553d3d2a6b1a302f1b79eb263190554345 h: refs/heads/master i:   69493:
 26a34133dc1aef6533907c6ce278870eb5634b93   69491:
 69f970783f108d30aea8e664bfa75ba5d9511941   69487:
 6faf0c045eb2334d2fb5ba06721f335a14737079 v: v3

---
 [refs]                 |  2 +-
 trunk/arch/arm/Kconfig | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 637bdffcaf61..d2b94a39fdcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e621a8e3752367d4aae78a8ab00a18fb2793f34
+refs/heads/master: 58273e553d3d2a6b1a302f1b79eb263190554345
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 4b984b120999..fcd1d8f95a21 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/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"