summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-14 13:32:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-14 13:32:56 -0700
commit0269c5c6d9a9de22715ecda589730547435cd3e8 (patch)
treedf444789f84a638918319fa2a93ea01a9bb310b5 /Documentation
parent7775c9753b94fe429dc4323360d6502c95e0dd6e (diff)
parent81d5575a48f49f494289a1299a32e4e5e41fbf40 (diff)
downloadlinux-3.10-0269c5c6d9a9de22715ecda589730547435cd3e8.tar.gz
linux-3.10-0269c5c6d9a9de22715ecda589730547435cd3e8.tar.bz2
linux-3.10-0269c5c6d9a9de22715ecda589730547435cd3e8.zip
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: fixup write combine comment in pci_mmap_resource x86: PAT export resource_wc in pci sysfs x86, pci-dma.c: don't always add __GFP_NORETRY to gfp suspend-vs-iommu: prevent suspend if we could not resume x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005) PCI: use dev_to_node in pci_call_probe PCI: Correct last two HP entries in the bfsort whitelist
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/sysfs-pci.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/filesystems/sysfs-pci.txt b/Documentation/filesystems/sysfs-pci.txt
index 5daa2aaec2c..68ef48839c0 100644
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
@@ -36,6 +36,7 @@ files, each with their own function.
local_cpus nearby CPU mask (cpumask, ro)
resource PCI resource host addresses (ascii, ro)
resource0..N PCI resource N, if present (binary, mmap)
+ resource0_wc..N_wc PCI WC map resource N, if prefetchable (binary, mmap)
rom PCI ROM resource, if present (binary, ro)
subsystem_device PCI subsystem device (ascii, ro)
subsystem_vendor PCI subsystem vendor (ascii, ro)