From: Colin Cross Date: Wed, 13 Oct 2010 01:50:31 +0000 (-0700) Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 X-Git-Tag: firefly_0821_release~9834^2~456 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c53cf3c0727c82aeacf4d08fca40a94b7557c811;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 Conflicts: arch/arm/mach-tegra/Makefile --- c53cf3c0727c82aeacf4d08fca40a94b7557c811 diff --cc arch/arm/mach-tegra/Makefile index 029947b4f298,8872cd54337f..4159860c0e88 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@@ -46,23 -43,4 +46,24 @@@ obj-${CONFIG_MACH_VENTANA 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