Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-tegra / Makefile

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 8872cd54337f1f191765489971c3b318380600d1..4159860c0e88e425ddaa6f5a6cfafc0ce395603d 100644 (file)
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -1,6 +1,7 @@
 obj-y                                   += common.o
 obj-y                                   += io.o
 obj-y                                   += irq.o legacy_irq.o
+obj-y                                  += syncpt.o
 obj-y                                   += clock.o
 obj-y                                   += timer.o
 obj-y                                   += gpio.o
@@ -34,6 +35,8 @@ obj-$(CONFIG_CPU_IDLE)                        += cpuidle.o
 obj-$(CONFIG_TEGRA_IOVMM)               += iovmm.o
 obj-$(CONFIG_TEGRA_IOVMM_GART)          += iovmm-gart.o
 
+obj-y                                  += nv/
+
 obj-${CONFIG_MACH_HARMONY}              += board-harmony.o
 obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o
 obj-${CONFIG_MACH_HARMONY}              += board-harmony-panel.o
@@ -44,3 +47,23 @@ obj-${CONFIG_MACH_VENTANA}              += board-ventana-pinmux.o
 obj-${CONFIG_MACH_VENTANA}              += board-ventana-sdhci.o
 obj-${CONFIG_MACH_VENTANA}              += board-ventana-power.o
 obj-${CONFIG_MACH_VENTANA}              += board-ventana-panel.o
+
+obj-${CONFIG_MACH_OLYMPUS}              += board-olympus.o
+obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-pinmux.o
+obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-panel.o
+obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-i2c.o
+obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-keypad.o
+obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-wifi.o
+
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-pinmux.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-panel.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-keypad.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-wifi.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-sensors.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-wlan_nvs.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-touch.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-power.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-rfkill.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-gps.o
+obj-${CONFIG_MACH_STINGRAY}             += board-stingray-usbnet.o