diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-16 20:23:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:23:26 +0100 |
| commit | 926aabde6318db321eb982ded8f5f63cd52fee74 (patch) | |
| tree | 416191da99edb8cbc3ef8da4cd4d59ca24f7dffa /arch/arm/mach-ixp4xx/include/mach | |
| parent | e9c610a49bf7b0f9e2bf231e762b2e82dcbdc63a (diff) | |
ARM: ixp4xx: avoid use of PCIBIOS_MIN_MEM in io.h
When using CONFIG_IXP4XX_INDIRECT_PCI, we run into a recursive
header file dependency between mach/io.h and asm/pci.h, resulting
in a build failure:
mach-ixp4xx/include/mach/io.h: In function 'is_pci_memory':
mach-ixp4xx/include/mach/io.h:53:18: error: 'PCIBIOS_MIN_MEM' undeclared (first use in this function)
return (addr >= PCIBIOS_MIN_MEM) && (addr <= 0x4FFFFFFF);
^
mach-ixp4xx/include/mach/io.h:53:18: note: each undeclared identifier is reported only once for each function it appears in
We can work around this by referencing the pcibios_min_mem variable
directly through an extern declaration, rather than using the macro.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include/mach')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/io.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 5cf30d1b78d2..559c69a47731 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h @@ -48,9 +48,10 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data); * fallback to the default. */ +extern unsigned long pcibios_min_mem; static inline int is_pci_memory(u32 addr) { - return (addr >= PCIBIOS_MIN_MEM) && (addr <= 0x4FFFFFFF); + return (addr >= pcibios_min_mem) && (addr <= 0x4FFFFFFF); } #define writeb(v, p) __indirect_writeb(v, p) |