rpms/kernel/devel linux-2.6-libata-intel-combined-quirk.patch, NONE, 1.1 kernel-2.6.spec, 1.1614, 1.1615

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25241

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-intel-combined-quirk.patch 
Log Message:
libata fix.


linux-2.6-libata-intel-combined-quirk.patch:
 quirks.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-libata-intel-combined-quirk.patch ---
--- linux-2.6.13/drivers/pci/quirks.c~	2005-10-16 22:50:54.000000000 -0400
+++ linux-2.6.13/drivers/pci/quirks.c	2005-10-16 22:51:34.000000000 -0400
@@ -1201,7 +1201,7 @@ static void __init quirk_alder_ioapic(st
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_EESSC,	quirk_alder_ioapic );
 #endif
 
-#ifdef CONFIG_SCSI_SATA
+#if defined(CONFIG_SCSI_SATA) || defined(CONFIG_SCSI_SATA_MODULE)
 static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)
 {
 	u8 prog, comb, tmp;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1614
retrieving revision 1.1615
diff -u -r1.1614 -r1.1615
--- kernel-2.6.spec	16 Oct 2005 23:31:13 -0000	1.1614
+++ kernel-2.6.spec	17 Oct 2005 03:06:13 -0000	1.1615
@@ -319,6 +319,7 @@
 Patch1700: linux-2.6-missing-exports.patch
 Patch1710: linux-2.6-radeon-backlight.patch
 Patch1720: linux-2.6-ide-tune-locking.patch
+Patch1730: linux-2.6-libata-intel-combined-quirk.patch
 
 # ACPI patches.
 Patch1800: linux-2.6-acpi-enable-ecburst.patch
@@ -756,6 +757,8 @@
 %patch1710 -p1
 # Fix IDE locking bug.
 %patch1720 -p1
+# Stop IDE claiming legacy ports before libata in combined mode.
+%patch1730 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1263,6 +1266,7 @@
 * Sun Oct 16 2005 Dave Jones <davej at redhat.com>
 - Enable ACPI EC Burst.
 - Change printk level of an ACPI message.
+- Stop IDE claiming legacy ports before libata in combined mode.
 
 * Sat Oct 15 2005 Dave Jones <davej at redhat.com>
 - 2.6.14-rc4-git4