Merge branch 'old_next' into next

[pandora-kernel.git] / Documentation / ABI / testing / sysfs-bus-pci

diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index f979d82..36bf454 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -145,9 +145,11 @@ Date:              July 2010
 Contact:       Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
 Description:
                Reading this attribute will provide the firmware
-               given name(SMBIOS type 41 string) of the PCI device.
-               The attribute will be created only if the firmware
-               has given a name to the PCI device.
+               given name (SMBIOS type 41 string or ACPI _DSM string) of
+               the PCI device. The attribute will be created only
+               if the firmware has given a name to the PCI device.
+               ACPI _DSM string name will be given priority if the
+               system firmware provides SMBIOS type 41 string also.
 Users:
                Userspace applications interested in knowing the
                firmware assigned name of the PCI device.
@@ -157,12 +159,27 @@ Date:             July 2010
 Contact:       Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
 Description:
                Reading this attribute will provide the firmware
-               given instance(SMBIOS type 41 device type instance)
-               of the PCI device. The attribute will be created
-               only if the firmware has given a device type instance
-               to the PCI device.
+               given instance (SMBIOS type 41 device type instance) of the
+               PCI device. The attribute will be created only if the firmware
+               has given an instance number to the PCI device.
 Users:
                Userspace applications interested in knowing the
                firmware assigned device type instance of the PCI
                device that can help in understanding the firmware
                intended order of the PCI device.
+
+What:          /sys/bus/pci/devices/.../acpi_index
+Date:          July 2010
+Contact:       Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
+Description:
+               Reading this attribute will provide the firmware
+               given instance (ACPI _DSM instance number) of the PCI device.
+               The attribute will be created only if the firmware has given
+               an instance number to the PCI device. ACPI _DSM instance number
+               will be given priority if the system firmware provides SMBIOS
+               type 41 device type instance also.
+Users:
+               Userspace applications interested in knowing the
+               firmware assigned instance number of the PCI
+               device that can help in understanding the firmware
+               intended order of the PCI device.