The patch titled pata: jmicron: Configuration has been added to the -mm tree. Its filename is pata-jmicron-configuration.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pata: jmicron: Configuration From: Alan Cox <alan@xxxxxxxxxx> Add the new jmicron driver to the configuration options Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/Kconfig | 8 ++++++++ drivers/scsi/Makefile | 1 + 2 files changed, 9 insertions(+) diff -puN drivers/scsi/Kconfig~pata-jmicron-configuration drivers/scsi/Kconfig --- a/drivers/scsi/Kconfig~pata-jmicron-configuration +++ a/drivers/scsi/Kconfig @@ -641,6 +641,14 @@ config SCSI_PATA_IT821X If unsure, say N. +config SCSI_ATA_JMICRON + tristate "JMicron non-AHCI support (Experimental)" + depends on SCSI_SATA && PCI && EXPERIMENTAL + help + This option enables support for Jmicron ATA controllers + when running in non-AHCI mode. Where possible you should + set the configuration for AHCI to get better performance + config SCSI_PATA_LEGACY tristate "Legacy ISA PATA support (Experimental)" depends on SCSI_SATA && PCI && EXPERIMENTAL diff -puN drivers/scsi/Makefile~pata-jmicron-configuration drivers/scsi/Makefile --- a/drivers/scsi/Makefile~pata-jmicron-configuration +++ a/drivers/scsi/Makefile @@ -140,6 +140,7 @@ obj-$(CONFIG_SCSI_PATA_HPT3X3) += libata obj-$(CONFIG_SCSI_PATA_ISAPNP) += libata.o pata_isapnp.o obj-$(CONFIG_SCSI_PATA_IT8172) += libata.o pata_it8172.o obj-$(CONFIG_SCSI_PATA_IT821X) += libata.o pata_it821x.o +obj-$(CONFIG_SCSI_PATA_JMICRON) += libata.o ata_jmicron.o obj-$(CONFIG_SCSI_PATA_NETCELL) += libata.o pata_netcell.o obj-$(CONFIG_SCSI_PATA_NS87410) += libata.o pata_ns87410.o obj-$(CONFIG_SCSI_PATA_OPTI) += libata.o pata_opti.o _ Patches currently in -mm which might be from alan@xxxxxxxxxx are origin.patch my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die.patch jmicron-pci-identifiers.patch pata-ata_piix-time0-time1-setup.patch pata-pata_ali-further-debug-work.patch pata-pata_amd-new-chips.patch pata-pata_ali-revisions-below-0x20-need-cd-config-poking-too.patch pata-sort-out-mc65-compile-for-now.patch pata-libata-fix-the-host_set-hacks-and-sort-out-simplex-mode.patch pata-pata_it821x-fix-pass-through.patch pata-ahci-ensure-that-we-dont-grab-both-functions.patch pata-jmicron-add-quirks-to-force-the-device-into-a-sane-mode.patch pata-jmicron-configuration.patch pata-it821x-fix-the-atapi-autodma-setup.patch pata-ata_generic-generic-bios-setup-sff-ata-driver.patch pata-jmicron-ide-old-type-driver.patch pata-pata_qdi-fix-return-code.patch pata-ide-jmicron-finish-writing.patch pata-jmicron-it-works-better-if-you-get-the-file-name-right.patch pata-jmicron-further-clean-up.patch pata-ata_jmicro-fix-an-escapee.patch pata-jmicron-jmicron-multifunction-setup.patch pata-libata-enable-per-device-speed-setting.patch pata-jmicron-missed-one.patch sanitize-3c589_cs.patch ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch move-ide-to-unmaintained-drop-reference-to-old-git-tree.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html