Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
This commit is contained in:
commit
1b66e9fe85
|
@ -29,6 +29,8 @@
|
||||||
* NV-specific details such as register offsets, SATA phy location,
|
* NV-specific details such as register offsets, SATA phy location,
|
||||||
* hotplug info, etc.
|
* hotplug info, etc.
|
||||||
*
|
*
|
||||||
|
* 0.09
|
||||||
|
* - Fixed bug introduced by 0.08's MCP51 and MCP55 support.
|
||||||
*
|
*
|
||||||
* 0.08
|
* 0.08
|
||||||
* - Added support for MCP51 and MCP55.
|
* - Added support for MCP51 and MCP55.
|
||||||
|
@ -132,9 +134,7 @@ enum nv_host_type
|
||||||
GENERIC,
|
GENERIC,
|
||||||
NFORCE2,
|
NFORCE2,
|
||||||
NFORCE3,
|
NFORCE3,
|
||||||
CK804,
|
CK804
|
||||||
MCP51,
|
|
||||||
MCP55
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct pci_device_id nv_pci_tbl[] = {
|
static struct pci_device_id nv_pci_tbl[] = {
|
||||||
|
@ -153,13 +153,13 @@ static struct pci_device_id nv_pci_tbl[] = {
|
||||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
|
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
|
||||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },
|
||||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA,
|
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA,
|
||||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
|
||||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2,
|
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2,
|
||||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
|
||||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,
|
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,
|
||||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
|
||||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
|
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
|
||||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
|
||||||
{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
|
{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
|
||||||
PCI_ANY_ID, PCI_ANY_ID,
|
PCI_ANY_ID, PCI_ANY_ID,
|
||||||
PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
|
PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
|
||||||
|
|
Loading…
Reference in a new issue