diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 11:06:53 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 11:06:53 +0200 |
| commit | 4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 (patch) | |
| tree | 3932656b422e63e3d3fc4629a57a1a8b7f03ef42 /arch/arm/mach-shmobile/Makefile | |
| parent | ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file (diff) | |
| parent | ARM: shmobile: r8a7740: Add TPU node to the device tree (diff) | |
| download | linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.xz linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.zip | |
Merge branch 'dt2' into cleanup3-base
Conflicts:
arch/arm/mach-shmobile/Makefile.boot
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index e3f8592fab88..f6881f9b7d5f 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -34,11 +34,14 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o # Board objects obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o +obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o +obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o obj-$(CONFIG_MACH_LAGER) += board-lager.o +obj-$(CONFIG_MACH_LAGER_REFERENCE) += board-lager-reference.o obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o |