diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-08 07:10:59 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-08 07:10:59 +0200 |
| commit | 5db3f620073d380a0421da66f4e3248e6deee024 (patch) | |
| tree | d15a8cac8d18108ceb40f468274fd30a0e8c4be1 /arch/arm/plat-versatile/Makefile | |
| parent | ARM: spear: Staticize local symbols in spear1340.c (diff) | |
| parent | video: move Versatile CLCD helpers (diff) | |
| download | linux-5db3f620073d380a0421da66f4e3248e6deee024.tar.xz linux-5db3f620073d380a0421da66f4e3248e6deee024.zip | |
Merge tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
Merge "First pull request of Versatile family clean-ups for v3.17" from Linus
Walleij:
- Remove <mach/memory.h> from the Integrator, paving the
road for multiplatform.
- Push the CLCD helper code down into the framebuffer subsystem,
removing the last hook in plat-versatile for the Integrator,
also paving the road for multiplatform.
Patches tested on Integrator/AP, Integrator/CP and Versatile AB
(all real hardware).
* tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
video: move Versatile CLCD helpers
ARM: integrator: get rid of <mach/memory.h>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-versatile/Makefile')
| -rw-r--r-- | arch/arm/plat-versatile/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 2e0c472958ae..03c4900ac3f4 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile @@ -1,6 +1,5 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o -obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o |