summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/Makefile
diff options
context:
space:
mode:
authorPaul Mundt2012-01-10 06:38:38 +0100
committerPaul Mundt2012-01-10 06:38:38 +0100
commitcc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86 (patch)
tree24e175ed43f1075ec252d6f63bfdeea921e60e6d /arch/arm/mach-shmobile/Makefile
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
parentARM: mach-shmobile: Unset initramfs source in bonito defconfig. (diff)
downloadkernel-qcow2-linux-cc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86.tar.gz
kernel-qcow2-linux-cc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86.tar.xz
kernel-qcow2-linux-cc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86.zip
Merge branch 'rmobile/bonito' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
-rw-r--r--arch/arm/mach-shmobile/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 83e35f254bff..957e5c7a38fe 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o
obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
obj-$(CONFIG_MACH_KOTA2) += board-kota2.o
+obj-$(CONFIG_MACH_BONITO) += board-bonito.o
# Framework support
obj-$(CONFIG_SMP) += $(smp-y)