diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/pci | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
| download | op-kernel-dev-e47b207a5bcb73bb097f94d9fe364f50737b0eb2.zip op-kernel-dev-e47b207a5bcb73bb097f94d9fe364f50737b0eb2.tar.gz | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 3 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index b8d2385..92d5e8d 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -150,8 +150,7 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, } /** - * pci_match_device - Tell if a PCI device structure has a matching - * PCI device id structure + * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure * @drv: the PCI driver to match against * @dev: the PCI device structure to match against * diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 0a70943..ef882a8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1002,6 +1002,11 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) case 0x186a: /* M6Ne notebook */ asus_hides_smbus = 1; } + if (dev->device == PCI_DEVICE_ID_INTEL_82865_HB) + switch (dev->subsystem_device) { + case 0x80f2: /* P4P800-X */ + asus_hides_smbus = 1; + } if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB) { switch (dev->subsystem_device) { case 0x1882: /* M6V notebook */ |
