summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJeff Garzik2006-09-06 16:48:19 +0200
committerJeff Garzik2006-09-06 16:48:19 +0200
commit406176ee7ef81cec3f346ecd41286a67148e3b0c (patch)
treef938fc24d000b5217d95fb8a1b4e0a2c9d2bbae6 /drivers/ata
parentMerge branch 'upstream' into pata-drivers (diff)
downloadkernel-qcow2-linux-406176ee7ef81cec3f346ecd41286a67148e3b0c.tar.gz
kernel-qcow2-linux-406176ee7ef81cec3f346ecd41286a67148e3b0c.tar.xz
kernel-qcow2-linux-406176ee7ef81cec3f346ecd41286a67148e3b0c.zip
[libata] Add pata_jmicron driver to Kconfig, Makefile
Someone on LKML noticed it was missing (sorry, missed the name). Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/Kconfig9
-rw-r--r--drivers/ata/Makefile1
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cbda988692e7..cbf0deb25033 100644
--- 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
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index b183a04aeaf7..e42d14dbf037 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_PATA_HPT3X3) += pata_hpt3x3.o
obj-$(CONFIG_PATA_ISAPNP) += pata_isapnp.o
obj-$(CONFIG_PATA_IT8172) += pata_it8172.o
obj-$(CONFIG_PATA_IT821X) += pata_it821x.o
+obj-$(CONFIG_PATA_JMICRON) += pata_jmicron.o
obj-$(CONFIG_PATA_NETCELL) += pata_netcell.o
obj-$(CONFIG_PATA_NS87410) += pata_ns87410.o
obj-$(CONFIG_PATA_OPTI) += pata_opti.o