diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-18 21:54:22 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-18 21:54:22 +0300 |
| commit | 82e527df2843225d45705b8752c606a62afbf29a (patch) | |
| tree | d4545801f28b82cfe8e2f4e17e2909ad72d1d6e5 /include | |
| parent | 5a4e4c8f0236bc4cbb88aef5a706116e60e7ccc7 (diff) | |
| parent | 0717b8769bce4c40d1086a53648d2be306bc2a72 (diff) | |
| download | linux-82e527df2843225d45705b8752c606a62afbf29a.tar.xz | |
Merge branch 'net-marvell-freescale-compile-test'
Florian Fainelli says:
====================
net: Enable COMPILE_TEST for Marvell & Freescale drivers
This patch series allows building the Freescale and Marvell Ethernet network
drivers with COMPILE_TEST.
Changes in v4:
- add proper HAS_DMA to fix build errors on m32r
- provide an inline stub for mvebu_mbus_get_dram_win_info
- added an additional patch to fix build errors with mv88e6xxx on m32r
Changes in v3:
- reorder patches to avoid introducing a build warning between commits
Changes in v2:
- rename register define clash when building for i386 (spotted by LKP)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mbus.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mbus.h b/include/linux/mbus.h index 2931aa43dab1..0d3f14fd2621 100644 --- a/include/linux/mbus.h +++ b/include/linux/mbus.h @@ -82,6 +82,7 @@ static inline int mvebu_mbus_get_io_win_info(phys_addr_t phyaddr, u32 *size, } #endif +#ifdef CONFIG_MVEBU_MBUS int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr); void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); void mvebu_mbus_get_pcie_io_aperture(struct resource *res); @@ -97,5 +98,12 @@ int mvebu_mbus_init(const char *soc, phys_addr_t mbus_phys_base, size_t mbus_size, phys_addr_t sdram_phys_base, size_t sdram_size); int mvebu_mbus_dt_init(bool is_coherent); +#else +static inline int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, + u8 *attr) +{ + return -EINVAL; +} +#endif /* CONFIG_MVEBU_MBUS */ #endif /* __LINUX_MBUS_H */ |