summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-18 15:05:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-18 15:05:22 -0700
commit2044f2282d7558c765270d78e19dbdcf6190ca71 (patch)
tree03b2c4d211fa8e7e2ef8c489d28a16442f030d57 /include/linux
parentbea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d (diff)
parent58c84eda07560a6b75b03e8d3b26d6eddfc14011 (diff)
downloadop-kernel-dev-2044f2282d7558c765270d78e19dbdcf6190ca71.zip
op-kernel-dev-2044f2282d7558c765270d78e19dbdcf6190ca71.tar.gz
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: fall back to original BIOS BAR addresses
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7cb0084..f26fda7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -288,6 +288,7 @@ struct pci_dev {
*/
unsigned int irq;
struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
+ resource_size_t fw_addr[DEVICE_COUNT_RESOURCE]; /* FW-assigned addr */
/* These fields are used by common fixups */
unsigned int transparent:1; /* Transparent PCI bridge */
OpenPOWER on IntegriCloud