ARM: Build fix after Tegra14 K3.4 merge

[linux-3.10.git] / arch / arm / mach-tegra / Makefile

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 3ba621194d1af89955fb86f9205e9d5e7fa2ef6f..a9584f46718b21d2e89a567b5e17bc583765f665 100644 (file)
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -70,9 +70,12 @@ obj-$(CONFIG_TEGRA_FIQ_DEBUGGER)        += tegra_fiq_debugger.o
 obj-$(CONFIG_TEGRA_ARB_SEMAPHORE)       += arb_sema.o
 obj-y                                   += dvfs.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_dvfs.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += tegra11_dvfs.o
 ifeq ($(CONFIG_TEGRA_SILICON_PLATFORM),y)
 obj-$(CONFIG_TEGRA_LATENCY_ALLOWANCE)   += latency_allowance.o
 obj-$(CONFIG_TEGRA_EDP_LIMITS)          += edp.o
+obj-$(CONFIG_TEGRA_CORE_EDP_LIMITS)     += edp_core.o
+obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_edp.o
 endif
 ifeq ($(CONFIG_TEGRA_SILICON_PLATFORM),y)
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_speedo.o
@@ -82,9 +85,11 @@ obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra3_actmon.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_emc.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_emc.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_emc.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += tegra11_emc.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += pinmux-tegra20-tables.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += pinmux-tegra30-tables.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += pinmux-t11-tables.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += pinmux-t14-tables.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += tegra20_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += tegra30_speedo.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
@@ -93,6 +98,7 @@ obj-y                                 += flowctrl.o
 obj-$(CONFIG_CPU_IDLE)                 += cpuidle.o
 obj-$(CONFIG_CPU_IDLE)                 += sleep.o
 obj-$(CONFIG_ARCH_TEGRA_11x_SOC)        += tegra11_clocks.o
+obj-$(CONFIG_ARCH_TEGRA_14x_SOC)        += tegra11_clocks.o
 obj-$(CONFIG_SMP)                       += platsmp.o
 obj-y                                   += reset.o
 obj-y                                   += headsmp.o
@@ -128,6 +134,7 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC)             += board-harmony-pcie.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += board-paz00.o
 
 obj-y                                  += board-common.o
+obj-$(CONFIG_TEGRA_WAKEUP_MONITOR)      += tegra_wakeup_monitor.o
 
 # MC error reporting.
 ifeq ($(CONFIG_ARCH_TEGRA_2x_SOC),)
@@ -160,6 +167,9 @@ obj-${CONFIG_MACH_DALMORE}              += board-dalmore-panel.o
 obj-${CONFIG_MACH_DALMORE}              += board-roth-panel.o
 obj-${CONFIG_MACH_DALMORE}              += board-dalmore-kbc.o
 obj-${CONFIG_MACH_DALMORE}             += board-dalmore-sensors.o
+obj-${CONFIG_MACH_DALMORE}              += panel-a-1080p-11-6.o
+obj-${CONFIG_MACH_DALMORE}              += panel-p-wuxga-10-1.o
+obj-${CONFIG_MACH_DALMORE}              += panel-s-wqxga-10-1.o
 
 obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto.o
 obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-memory.o
@@ -170,8 +180,24 @@ obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-panel.o
 obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-kbc.o
 obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-sensors.o
 obj-${CONFIG_MACH_TEGRA_PLUTO}          += board-pluto-powermon.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += panel-l-720p-5.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += panel-j-720p-4-7.o
+obj-${CONFIG_MACH_TEGRA_PLUTO}          += panel-s-1080p-5.o
 
 obj-${CONFIG_TEGRA_BB_XMM_POWER}        += baseband-xmm-power.o
 obj-${CONFIG_TEGRA_BB_XMM_POWER2}       += baseband-xmm-power2.o
 
-obj-${CONFIG_TEGRA_ISOMGR}             += isomgr.o
+obj-${CONFIG_TEGRA_ISOMGR}              += isomgr.o
+
+obj-${CONFIG_TEGRA_NVDUMPER}            += nvdumper.o
+
+obj-${CONFIG_MACH_ROTH}                 += board-roth.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-memory.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-pinmux.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-power.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-powermon.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-sdhci.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-panel.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-kbc.o
+obj-${CONFIG_MACH_ROTH}                 += board-roth-sensors.o
+obj-${CONFIG_MACH_ROTH}                        += board-roth-fan.o