diff options
| author | Grant Likely | 2010-06-08 15:48:09 +0200 |
|---|---|---|
| committer | Grant Likely | 2010-07-06 00:14:26 +0200 |
| commit | 1f5bef30cf6c66f097ea5dfc580a41924df888d1 (patch) | |
| tree | 345d9db4b6b20de814599cb7129005abd945ceea /arch/microblaze/include/asm/pci-bridge.h | |
| parent | of/address: merge of_iomap() (diff) | |
| download | kernel-qcow2-linux-1f5bef30cf6c66f097ea5dfc580a41924df888d1.tar.gz kernel-qcow2-linux-1f5bef30cf6c66f097ea5dfc580a41924df888d1.tar.xz kernel-qcow2-linux-1f5bef30cf6c66f097ea5dfc580a41924df888d1.zip | |
of/address: merge of_address_to_resource()
Merge common code between PowerPC and Microblaze. This patch also
moves the prototype of pci_address_to_pio() out of pci-bridge.h and
into prom.h because the only user of pci_address_to_pio() is
of_address_to_resource().
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michal Simek <monstr@monstr.eu>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/microblaze/include/asm/pci-bridge.h')
| -rw-r--r-- | arch/microblaze/include/asm/pci-bridge.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h index 0c77cda9f5d8..0c68764ab547 100644 --- a/arch/microblaze/include/asm/pci-bridge.h +++ b/arch/microblaze/include/asm/pci-bridge.h @@ -172,13 +172,8 @@ static inline int pci_has_flag(int flag) extern struct list_head hose_list; -extern unsigned long pci_address_to_pio(phys_addr_t address); extern int pcibios_vaddr_is_ioport(void __iomem *address); #else -static inline unsigned long pci_address_to_pio(phys_addr_t address) -{ - return (unsigned long)-1; -} static inline int pcibios_vaddr_is_ioport(void __iomem *address) { return 0; |