summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-02 02:46:17 +0100
committerArnd Bergmann <arnd@arndb.de>2011-11-02 02:46:17 +0100
commitb8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (patch)
tree5e57a2fdc5fa05155d7d8214ad054b16f6b1c3d8 /arch/arm/Makefile
parent884897e6a10a86de0e611a76f4bf3fd0068a672c (diff)
parent76780127914d5dc69a458eda5e471e65a5fd3dc9 (diff)
downloadblackbird-op-linux-b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea.tar.gz
blackbird-op-linux-b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea.zip
Merge branch 'picoxcell/soc' into next/soc
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e8688114ca95..e775f93844a7 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -169,6 +169,7 @@ machine-$(CONFIG_ARCH_OMAP2) := omap2
machine-$(CONFIG_ARCH_OMAP3) := omap2
machine-$(CONFIG_ARCH_OMAP4) := omap2
machine-$(CONFIG_ARCH_ORION5X) := orion5x
+machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell
machine-$(CONFIG_ARCH_PNX4008) := pnx4008
machine-$(CONFIG_ARCH_PRIMA2) := prima2
machine-$(CONFIG_ARCH_PXA) := pxa
OpenPOWER on IntegriCloud