From: Colin Cross <ccross@android.com>
Date: Wed, 13 Oct 2010 01:47:05 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~157
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d533ce331337e58f16b25e5de9a57f1665c4a73;p=firefly-linux-kernel-4.4.55.git

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

3d533ce331337e58f16b25e5de9a57f1665c4a73
diff --cc arch/arm/mach-tegra/board-ventana.c
index a1d55e71a820,82e3a22efa3e..60948ad9dba4
--- a/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.c
@@@ -33,8 -33,8 +33,9 @@@
  #include <linux/gpio.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
 +#include <linux/usb/android_composite.h>
  
+ #include <mach/clk.h>
  #include <mach/iomap.h>
  #include <mach/irqs.h>
  #include <mach/pinmux.h>