summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/Makefile
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-09-14 11:34:47 -0600
committerStephen Warren <swarren@nvidia.com>2012-09-14 11:34:47 -0600
commit1f10478cabacf55f87be5ed4440d07378f19c237 (patch)
tree7dc682d14ea3ebd261e48fccb14c8a759ee4dfb8 /arch/arm/mach-tegra/Makefile
parenta5b64ce64d6bdceecd45a07893affbf88d7bb7d2 (diff)
parentbe972c3272c354b323afcb7e9552a9b04e675a8b (diff)
Merge branch 'for-3.7/board-removal' into for-3.7/cleanup2
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r--arch/arm/mach-tegra/Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index c3d7303b9ac8..56065acbd816 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -26,13 +26,6 @@ obj-$(CONFIG_USB_SUPPORT) += usb_phy.o
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o
obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.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_ARCH_TEGRA_2x_SOC) += board-harmony-pcie.o
-obj-$(CONFIG_MACH_PAZ00) += board-paz00.o
-obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o
-
-obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o
-obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o
+obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o