From: Erik Gilling <konkers@android.com>
Date: Sat, 30 Oct 2010 01:14:13 +0000 (-0700)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~133
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62ce7a7f823cddb53e5e45f0644b5277581269db;p=firefly-linux-kernel-4.4.55.git

Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: I6f5240610c57da5fe73951a1727944b5a4ff32db
---

62ce7a7f823cddb53e5e45f0644b5277581269db
diff --cc arch/arm/mach-tegra/Makefile
index 869dd4cafdc3,cb2ad3b36582..29379edaf975
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -12,9 -12,9 +12,10 @@@ obj-
  obj-y					+= suspend.o
  obj-y					+= fuse.o
  obj-y					+= tegra_i2s_audio.o
+ 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_ARCH_TEGRA_2x_SOC)         += clock.o