diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /arch/powerpc/include/asm/pci-bridge.h | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'arch/powerpc/include/asm/pci-bridge.h')
| -rw-r--r-- | arch/powerpc/include/asm/pci-bridge.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index ae2ea803a0f2..9047af7baa69 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h | |||
| @@ -74,6 +74,13 @@ struct pci_controller { | |||
| 74 | unsigned long pci_io_size; | 74 | unsigned long pci_io_size; |
| 75 | #endif | 75 | #endif |
| 76 | 76 | ||
| 77 | /* Some machines have a special region to forward the ISA | ||
| 78 | * "memory" cycles such as VGA memory regions. Left to 0 | ||
| 79 | * if unsupported | ||
| 80 | */ | ||
| 81 | resource_size_t isa_mem_phys; | ||
| 82 | resource_size_t isa_mem_size; | ||
| 83 | |||
| 77 | struct pci_ops *ops; | 84 | struct pci_ops *ops; |
| 78 | unsigned int __iomem *cfg_addr; | 85 | unsigned int __iomem *cfg_addr; |
| 79 | void __iomem *cfg_data; | 86 | void __iomem *cfg_data; |