diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 14:59:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 14:59:51 -0400 |
| commit | 59ef7a83f1127038a433464597df02e2dc9540e7 (patch) | |
| tree | 725d262fc2e68eb9c592d76265f878cec73f8f2d /Documentation/ABI | |
| parent | 5165aece0efac6574fc3e32b6f1c2a964820d1c6 (diff) | |
| parent | 2af5066f664cb011cf17d2e4414491fe24597e07 (diff) | |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (74 commits)
PCI: make msi_free_irqs() to use msix_mask_irq() instead of open coded write
PCI: Fix the NIU MSI-X problem in a better way
PCI ASPM: remove get_root_port_link
PCI ASPM: cleanup pcie_aspm_sanity_check
PCI ASPM: remove has_switch field
PCI ASPM: cleanup calc_Lx_latency
PCI ASPM: cleanup pcie_aspm_get_cap_device
PCI ASPM: cleanup clkpm checks
PCI ASPM: cleanup __pcie_aspm_check_state_one
PCI ASPM: cleanup initialization
PCI ASPM: cleanup change input argument of aspm functions
PCI ASPM: cleanup misc in struct pcie_link_state
PCI ASPM: cleanup clkpm state in struct pcie_link_state
PCI ASPM: cleanup latency field in struct pcie_link_state
PCI ASPM: cleanup aspm state field in struct pcie_link_state
PCI ASPM: fix typo in struct pcie_link_state
PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS
PCI: remove redundant __msi_set_enable()
PCI PM: consistently use type bool for wake enable variable
x86/ACPI: Correct maximum allowed _CRS returned resources and warn if exceeded
...
Diffstat (limited to 'Documentation/ABI')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-pci | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index 97ad190e13af..6bf68053e4b8 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci | |||
| @@ -122,3 +122,10 @@ Description: | |||
| 122 | This symbolic link appears when a device is a Virtual Function. | 122 | This symbolic link appears when a device is a Virtual Function. |
| 123 | The symbolic link points to the PCI device sysfs entry of the | 123 | The symbolic link points to the PCI device sysfs entry of the |
| 124 | Physical Function this device associates with. | 124 | Physical Function this device associates with. |
| 125 | |||
| 126 | What: /sys/bus/pci/slots/.../module | ||
| 127 | Date: June 2009 | ||
| 128 | Contact: linux-pci@vger.kernel.org | ||
| 129 | Description: | ||
| 130 | This symbolic link points to the PCI hotplug controller driver | ||
| 131 | module that manages the hotplug slot. | ||