From 599f7ff32de5a2e822033394c218530c6d906836 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 6 Sep 2006 10:48:19 -0400 Subject: [PATCH] --- yaml --- r: 35416 b: refs/heads/master c: 406176ee7ef81cec3f346ecd41286a67148e3b0c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/Kconfig | 9 +++++++++ trunk/drivers/ata/Makefile | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d83eabaf88a2..f66f1adb3bf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc851fad00d7fa1bf4ac7034d9ba8041bf482d50 +refs/heads/master: 406176ee7ef81cec3f346ecd41286a67148e3b0c diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig index cbda988692e7..cbf0deb25033 100644 --- a/trunk/drivers/ata/Kconfig +++ b/trunk/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/trunk/drivers/ata/Makefile b/trunk/drivers/ata/Makefile index b183a04aeaf7..e42d14dbf037 100644 --- a/trunk/drivers/ata/Makefile +++ b/trunk/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