Merge branches 'release' and 'menlo' into release

[safe/jmp/linux-2.6] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 4e6487d..b86877b 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -8,6 +8,8 @@ source "drivers/connector/Kconfig"
 
 source "drivers/mtd/Kconfig"
 
+source "drivers/of/Kconfig"
+
 source "drivers/parport/Kconfig"
 
 source "drivers/pnp/Kconfig"
@@ -50,10 +52,20 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/spi/Kconfig"
 
+source "drivers/gpio/Kconfig"
+
 source "drivers/w1/Kconfig"
 
+source "drivers/power/Kconfig"
+
 source "drivers/hwmon/Kconfig"
 
+source "drivers/thermal/Kconfig"
+
+source "drivers/watchdog/Kconfig"
+
+source "drivers/ssb/Kconfig"
+
 source "drivers/mfd/Kconfig"
 
 source "drivers/media/Kconfig"
@@ -78,8 +90,9 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
-source "drivers/auxdisplay/Kconfig"
+source "drivers/dca/Kconfig"
 
-source "drivers/kvm/Kconfig"
+source "drivers/auxdisplay/Kconfig"
 
+source "drivers/uio/Kconfig"
 endmenu