diff --git a/[refs] b/[refs]
index b3db491d0cc9..fc9f3ab51f5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24dd01bfbce685395dc0ade71308326b3861187a
+refs/heads/master: 421b20b9c44b3fcdc07d6af875dad5ae86fad014
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index 03d96894419c..2109d755c14d 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -1,3 +1,9 @@
+#
+# SATA/PATA driver configuration
+#
+
+menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
+	depends on SCSI
 
 config ATA
 	tristate "ATA device support"
@@ -138,3 +144,5 @@ config SATA_INTEL_COMBINED
 	depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)
 	default y
 
+endmenu
+