diff --git a/[refs] b/[refs] index d18cb5740d2b..ba1163eda435 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c4a90fd2b9d1f5c0d33df3fcfaa8a3dae9abc53 +refs/heads/master: 097dac91837b35947fffb0e303bcf71e4e4a789f diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig index f2df6e2a224c..33133c6851c5 100644 --- a/trunk/drivers/ata/Kconfig +++ b/trunk/drivers/ata/Kconfig @@ -3,7 +3,7 @@ # menuconfig ATA - tristate "Serial ATA (prod) and Parallel ATA (experimental) drivers" + tristate "Serial ATA and Parallel ATA drivers" depends on HAS_IOMEM depends on BLOCK depends on !(M32R || M68K) || BROKEN