From: Erik Gilling <konkers@android.com>
Date: Fri, 25 Feb 2011 01:18:22 +0000 (-0800)
Subject: Merge branch 'android-tegra' into android-tegra-moto
X-Git-Tag: firefly_0821_release~9834^2~93
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5257d707de2a0cff758a92aa43071b375555dc58;p=firefly-linux-kernel-4.4.55.git

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

5257d707de2a0cff758a92aa43071b375555dc58
diff --cc arch/arm/mach-tegra/Makefile
index dc7828a23fd2,70ad2462cb17..3d13786352a2
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -1,7 -1,7 +1,8 @@@
  obj-y                                   += common.o
+ obj-y                                   += apbio.o
  obj-y                                   += io.o
  obj-y                                   += irq.o legacy_irq.o
 +obj-y					+= syncpt.o
  obj-y                                   += clock.o
  obj-y                                   += dvfs.o
  obj-y                                   += timer.o