Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 08d4ae201597cde366f07efc2a4a8f4f8e08d83e..d19b6f5a1106b5202d88ecbe0dccad43a129c369 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -52,12 +52,16 @@ 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"
@@ -76,8 +80,12 @@ source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"
 
+source "drivers/memstick/Kconfig"
+
 source "drivers/leds/Kconfig"
 
+source "drivers/accessibility/Kconfig"
+
 source "drivers/infiniband/Kconfig"
 
 source "drivers/edac/Kconfig"
@@ -92,5 +100,7 @@ source "drivers/auxdisplay/Kconfig"
 
 source "drivers/uio/Kconfig"
 
-source "drivers/virtio/Kconfig"
+source "drivers/xen/Kconfig"
+
+source "drivers/staging/Kconfig"
 endmenu