Merge branch 'master' into upstream

[linux-2.6] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 8b11cebe65df5ad396f8fb975e158466f9dd859b..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"