summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/Makefile
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-03-18 19:38:08 -0700
committerColin Cross <ccross@android.com>2011-03-18 19:38:08 -0700
commit84abf6084704673ae80a2105bf63ece5eee3edd5 (patch)
treeb65d3fab2b7e86935f9248053d741ed91f68b6b3 /arch/arm/mach-tegra/Makefile
parentc871fe663a6368fd0e98f5a3bfd81b0b9c591266 (diff)
parent2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2 (diff)
downloadblackbird-op-linux-84abf6084704673ae80a2105bf63ece5eee3edd5.tar.gz
blackbird-op-linux-84abf6084704673ae80a2105bf63ece5eee3edd5.zip
Merge branch 'boards-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r--arch/arm/mach-tegra/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 9bf39fa34d85..bbe1dbe939bb 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -21,6 +21,10 @@ obj-$(CONFIG_TEGRA_PCI) += pcie.o
obj-${CONFIG_MACH_HARMONY} += board-harmony.o
obj-${CONFIG_MACH_HARMONY} += board-harmony-pinmux.o
obj-${CONFIG_MACH_HARMONY} += board-harmony-pcie.o
+obj-${CONFIG_MACH_HARMONY} += board-harmony-power.o
+
+obj-${CONFIG_MACH_PAZ00} += board-paz00.o
+obj-${CONFIG_MACH_PAZ00} += board-paz00-pinmux.o
obj-${CONFIG_MACH_SEABOARD} += board-seaboard.o
obj-${CONFIG_MACH_SEABOARD} += board-seaboard-pinmux.o
OpenPOWER on IntegriCloud