From: Dima Zavin <dima@android.com>
Date: Tue, 14 Dec 2010 22:12:05 +0000 (-0800)
Subject: Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~86
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2da4db5bffe757188b0a06235e5e68505a5c20c4;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
---

2da4db5bffe757188b0a06235e5e68505a5c20c4
diff --cc arch/arm/mach-tegra/Makefile
index 9b8bdf9f5625,2223fee1aa92..b2374b94d9ea
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -16,8 -16,8 +16,9 @@@ obj-y					+= tegra_spdif_audio.
  obj-y					+= mc.o
  obj-$(CONFIG_USB_SUPPORT)               += usb_phy.o
  obj-$(CONFIG_FIQ)                       += fiq.o
 +obj-$(CONFIG_TEGRA_FIQ_DEBUGGER)        += tegra_fiq_debugger.o
  obj-$(CONFIG_TEGRA_PWM)                 += pwm.o
+ obj-$(CONFIG_TEGRA_ARB_SEMAPHORE)	+= arb_sema.o
  
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o