diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 18:12:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 18:12:09 +0200 |
| commit | c964cdc3694fb9b9975e1a5a098d208b1d49c885 (patch) | |
| tree | aa03a7ca74f10ab191223558203fec7fc871aeba /arch/arm/mach-realview/platsmp-dt.c | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
| parent | 8f2c00629e43b0f32785c3e89b61cca89058929a (diff) | |
Merge tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
Merge "delete the RealView boardfiles" from Linus Walleij:
This deletes the realview boardfiles, consolidates a bit
around the Kconfig options and leaves the mach-realview
directory nice and tidy, with all boards migrated over to
Device Tree.
* tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: imply device tree boot
ARM: realview: no need to select SMP_ON_UP explicitly
ARM: realview: delete the RealView board files
Diffstat (limited to 'arch/arm/mach-realview/platsmp-dt.c')
| -rw-r--r-- | arch/arm/mach-realview/platsmp-dt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/platsmp-dt.c b/arch/arm/mach-realview/platsmp-dt.c index 6964e8876061..70ca99eb52c6 100644 --- a/arch/arm/mach-realview/platsmp-dt.c +++ b/arch/arm/mach-realview/platsmp-dt.c @@ -17,8 +17,7 @@ #include <asm/smp_scu.h> #include <plat/platsmp.h> - -#include "core.h" +#include "hotplug.h" #define REALVIEW_SYS_FLAGSSET_OFFSET 0x30 |