diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 02:57:08 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 02:57:08 +0300 |
| commit | 3081dc9eff32519bc3298c6dba0b877675d4c1cd (patch) | |
| tree | d4c1d2af14e09e96dd015fa9163df88106b11ddf /arch/arm/mach-mv78xx0/mpp.c | |
| parent | 22ba14f41ca6b7f96fe3d4a8eb116358060595fd (diff) | |
| parent | c5d431e8c511788556651b91debd7d77d4508f4b (diff) | |
| download | linux-3081dc9eff32519bc3298c6dba0b877675d4c1cd.tar.xz | |
Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multiplatform
Merge "mvebu soc for 4.5 (part 1)" from Gregory CLEMENT:
- orion5x/mv78xx0 multiplatform conversion
- legacy dove PMU support conversion
* tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu:
ARM: dove: convert legacy dove to PMU support
soc: dove: add legacy support to PMU driver
ARM: orion5x: multiplatform support
ARM: orion5x: clean up mach/*.h headers
ARM: mv78xx0: multiplatform support
ARM: mv78xx0: clean up mach/*.h headers
ARM: orion: use SPARSE_IRQ everywhere
ARM: orion: always use MULTI_IRQ_HANDLER
ARM: orion: move watchdog setup to mach-orion5x
Conflicts:
arch/arm/Kconfig
arch/arm/mach-dove/include/mach/entry-macro.S
arch/arm/mach-orion5x/include/mach/entry-macro.S
Diffstat (limited to 'arch/arm/mach-mv78xx0/mpp.c')
| -rw-r--r-- | arch/arm/mach-mv78xx0/mpp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c index df50342179e2..72843c02e95a 100644 --- a/arch/arm/mach-mv78xx0/mpp.c +++ b/arch/arm/mach-mv78xx0/mpp.c @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/io.h> #include <plat/mpp.h> -#include <mach/hardware.h> +#include "mv78xx0.h" #include "common.h" #include "mpp.h" |