diff options
author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 13:51:05 -0700 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 13:51:05 -0700 |
commit | 883eed1b3e25fb1d7d8f32c6550cc1ac44888838 (patch) | |
tree | 387f080f51e4bdd96668ed59130f3439d68d0e64 /include | |
parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
parent | 45aec1ae72fc592f231e9e73ed9ed4d10cfbc0b5 (diff) | |
download | linux-stable-883eed1b3e25fb1d7d8f32c6550cc1ac44888838.tar.gz linux-stable-883eed1b3e25fb1d7d8f32c6550cc1ac44888838.tar.bz2 linux-stable-883eed1b3e25fb1d7d8f32c6550cc1ac44888838.zip |
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip into for-linus
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 509159bcd4e7..d18b1dd49fab 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -206,6 +206,7 @@ struct pci_dev { struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ int rom_attr_enabled; /* has display of the rom attribute been enabled? */ struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ + struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ #ifdef CONFIG_PCI_MSI struct list_head msi_list; #endif |