From: Erik Gilling <konkers@android.com>
Date: Mon, 18 Oct 2010 19:12:20 +0000 (-0700)
Subject: Merge branch 'linux-tegra' into android-tegra
X-Git-Tag: firefly_0821_release~9833^2~152
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b3a1cd90c79a9726ae1c45888088c73d629fb11;p=firefly-linux-kernel-4.4.55.git

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

5b3a1cd90c79a9726ae1c45888088c73d629fb11
diff --cc arch/arm/mach-tegra/tegra_i2s_audio.c
index 7b1fccbf820c,dc6e5597a438..03ef3c3551b8
--- a/arch/arm/mach-tegra/tegra_i2s_audio.c
+++ b/arch/arm/mach-tegra/tegra_i2s_audio.c
@@@ -41,10 -41,9 +41,10 @@@
  #include <linux/ktime.h>
  #include <linux/sysfs.h>
  #include <linux/pm_qos_params.h>
 +#include <linux/wakelock.h>
  #include <linux/delay.h>
  #include <linux/tegra_audio.h>
- 
+ #include <linux/pm.h>
  #include <mach/dma.h>
  #include <mach/iomap.h>
  #include <mach/i2s.h>