Merge branch 'master' into upstream

[linux-2.6] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9f5c0da57c9048ca9fcf98168b21e36390416a8a..263e86ddc1a4d0740b3e524ced6703d3a991f3d2 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
 
+source "drivers/ata/Kconfig"
+
 source "drivers/cdrom/Kconfig"
 
 source "drivers/md/Kconfig"
@@ -64,12 +66,14 @@ source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"
 
-source "drivers/infiniband/Kconfig"
+source "drivers/leds/Kconfig"
 
-source "drivers/sn/Kconfig"
+source "drivers/infiniband/Kconfig"
 
 source "drivers/edac/Kconfig"
 
 source "drivers/rtc/Kconfig"
 
+source "drivers/dma/Kconfig"
+
 endmenu