diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-21 14:44:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-21 14:44:18 +0200 |
| commit | 3cc5612b21bab85c8ce68636f2047f8477220b35 (patch) | |
| tree | 05d6e7de14f04a453f20a3e79cdb4999d303418e /include/linux | |
| parent | 17bd274e390f87db27acaabf7b9df7ceb04e6ef2 (diff) | |
| parent | ac29abf38176ec149671b01d228e0a9dc38e4e60 (diff) | |
| download | linux-3cc5612b21bab85c8ce68636f2047f8477220b35.tar.gz linux-3cc5612b21bab85c8ce68636f2047f8477220b35.tar.bz2 linux-3cc5612b21bab85c8ce68636f2047f8477220b35.zip | |
Merge tag 'mvebu-cleanup-4.8-2' of git://git.infradead.org/linux-mvebu into next/cleanup
Merge "mvebu cleanup for 4.8 (part 2)" from Gregory CLEMENT:
More cleanup for the mvebu mbus driver this time
* tag 'mvebu-cleanup-4.8-2' of git://git.infradead.org/linux-mvebu:
bus: mvebu-mbus: make mvebu_mbus_syscore_ops static
bus: mvebu-mbus: fix __iomem on register pointers
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mbus.h b/include/linux/mbus.h index ea34a867caa0..d610232762e3 100644 --- a/include/linux/mbus.h +++ b/include/linux/mbus.h @@ -66,7 +66,7 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(vo } #endif -int mvebu_mbus_save_cpu_target(u32 *store_addr); +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); int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr); |