diff --git a/[refs] b/[refs]
index 008713c691fe..17dfaed2aa30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bcfdde6767f2f07891d2753c25220012fe5e6d2
+refs/heads/master: b196fc69f7be7b4454781add9c2d5173f44d509b
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index 8e136ff013f4..ad1f59c1b3fc 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -2,11 +2,9 @@
 # SATA/PATA driver configuration
 #
 
-menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
+menuconfig ATA
+	tristate "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 	depends on HAS_IOMEM
-
-config ATA
-	tristate "ATA device support"
 	depends on BLOCK
 	depends on !(M32R || M68K) || BROKEN
 	depends on !SUN4 || BROKEN
@@ -585,6 +583,4 @@ config PATA_SCC
 
 	  If unsure, say N.
 
-endif
-endmenu
-
+endif # ATA