diff options
Diffstat (limited to 'openvz-sources/022.072-r1/5209_diff-libata-conflicts-20051025.patch')
| -rw-r--r-- | openvz-sources/022.072-r1/5209_diff-libata-conflicts-20051025.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/openvz-sources/022.072-r1/5209_diff-libata-conflicts-20051025.patch b/openvz-sources/022.072-r1/5209_diff-libata-conflicts-20051025.patch new file mode 100644 index 0000000..a2b8c32 --- /dev/null +++ b/openvz-sources/022.072-r1/5209_diff-libata-conflicts-20051025.patch @@ -0,0 +1,27 @@ +--- ./drivers/scsi/sata_nv.c.libataconf 2005-10-25 14:44:50.000000000 +0400 ++++ ./drivers/scsi/sata_nv.c 2005-10-25 14:46:56.609783752 +0400 +@@ -134,9 +134,11 @@ static struct pci_device_id nv_pci_tbl[] + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 }, ++ /* conflicts with amd75xx driver + { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, + PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC }, ++ */ + { 0, } /* terminate list */ + }; + +--- ./drivers/scsi/ata_piix.c.libataconf 2005-10-25 14:44:50.000000000 +0400 ++++ ./drivers/scsi/ata_piix.c 2005-10-25 14:46:05.639532408 +0400 +@@ -93,8 +93,10 @@ static struct pci_device_id piix_pci_tbl + { 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, + { 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, + { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, ++ /* supported by ahci driver + { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm }, + { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm }, ++ */ + { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata }, + { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata }, + { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata }, |