Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46fd9061 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: fix pci-driver kernel-doc
  PCI: rework Documentation/pci.txt
  PCI: Unhide the SMBus on the Asus P4P800-X
parents 39470bf2 ae9608af

Documentation/pci.txt

+549 −153

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pci/pci-driver.c

+1 −2
Original line number Diff line number Diff line
@@ -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

 *

drivers/pci/quirks.c

+5 −0
Original line number Diff line number Diff line
@@ -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 */