Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: clear bridge resource range if BIOS assigned bad one
  PCI: hotplug/cpqphp, fix NULL dereference
  Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
  PCI: change resource collision messages from KERN_ERR to KERN_INFO

1 files changed, 0 insertions, 40 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index 428676cfa61e..25be3250f7d6 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -133,46 +133,6 @@ Description:
                 The symbolic link points to the PCI device sysfs entry of the
                 Physical Function this device associates with.
 
-
-What:           /sys/bus/pci/slots/...
-Date:           April 2005 (possibly older)
-KernelVersion:  2.6.12 (possibly older)
-Contact:        linux-pci@vger.kernel.org
-Description:
-                When the appropriate driver is loaded, it will create a
-                directory per claimed physical PCI slot in
-                /sys/bus/pci/slots/.  The names of these directories are
-                specific to the driver, which in turn, are specific to the
-                platform, but in general, should match the label on the
-                machine's physical chassis.
-
-                The drivers that can create slot directories include the
-                PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.
-
-                The slot directories contain, at a minimum, a file named
-                'address' which contains the PCI bus:device:function tuple.
-                Other files may appear as well, but are specific to the
-                driver.
-
-What:           /sys/bus/pci/slots/.../function[0-7]
-Date:           March 2010
-KernelVersion:  2.6.35
-Contact:        linux-pci@vger.kernel.org
-Description:
-                If PCI slot directories (as described above) are created,
-                and the physical slot is actually populated with a device,
-                symbolic links in the slot directory pointing to the
-                device's PCI functions are created as well.
-
-What:           /sys/bus/pci/devices/.../slot
-Date:           March 2010
-KernelVersion:  2.6.35
-Contact:        linux-pci@vger.kernel.org
-Description:
-                If PCI slot directories (as described above) are created,
-                a symbolic link pointing to the slot directory will be
-                created as well.
-
 What:           /sys/bus/pci/slots/.../module
 Date:           June 2009
 Contact:        linux-pci@vger.kernel.org