Merge branch 'master' into upstream

[linux-2.6] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cbda988692e7ba97c94fccb015aad5ab5ec0465b..cbf0deb250334705db0ea6a6f902a72f4261388a 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -307,6 +307,15 @@ config PATA_IT821X
 
          If unsure, say N.
 
+config PATA_JMICRON
+       tristate "JMicron PATA support"
+       depends on PCI
+       help
+         Enable support for the JMicron IDE controller, via the new
+         ATA layer.
+
+         If unsure, say N.
+
 config PATA_LEGACY
        tristate "Legacy ISA PATA support (Experimental)"
        depends on PCI && EXPERIMENTAL