Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 45dbdc14915fc428c9ed58bc0c4381c63e4ec76f..f031b87323308e3131898edecf3be5863e171070 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
+       depends on HAS_IOMEM
 
 config ATA
        tristate "ATA device support"
@@ -435,7 +436,7 @@ config PATA_OPTIDMA
        help
          This option enables DMA/PIO support for the later OPTi
          controllers found on some old motherboards and in some
-         latops
+         laptops.
 
          If unsure, say N.