From 50f514084ce08e2e53c5d1d10acb0b207e0c7db9 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 6 Apr 2012 11:12:25 -0600
Subject: [PATCH] --- yaml --- r: 305597 b: refs/heads/master c:
 7613c508dfd7880cb7e17ad5eb64b9dfb0b80292 h: refs/heads/master i:   305595:
 4e357dc389e1a72ad7fe2674441d1119a728aa23 v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/tegra/tegra20_das.c   | 5 ++---
 trunk/sound/soc/tegra/tegra20_i2s.c   | 7 +++----
 trunk/sound/soc/tegra/tegra20_spdif.c | 5 ++---
 trunk/sound/soc/tegra/tegra_pcm.c     | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 0b63641b2668..e2ebc21a4f63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd115367424ebaba93d24abdf74e0d0fe498e41b
+refs/heads/master: 7613c508dfd7880cb7e17ad5eb64b9dfb0b80292
diff --git a/trunk/sound/soc/tegra/tegra20_das.c b/trunk/sound/soc/tegra/tegra20_das.c
index 486d7b245cf4..812696d9c863 100644
--- a/trunk/sound/soc/tegra/tegra20_das.c
+++ b/trunk/sound/soc/tegra/tegra20_das.c
@@ -20,14 +20,13 @@
  *
  */
 
-#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
+#include <linux/io.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/io.h>
-#include <mach/iomap.h>
 #include <sound/soc.h>
 #include "tegra20_das.h"
 
diff --git a/trunk/sound/soc/tegra/tegra20_i2s.c b/trunk/sound/soc/tegra/tegra20_i2s.c
index 878798c89e49..9427f36e6a25 100644
--- a/trunk/sound/soc/tegra/tegra20_i2s.c
+++ b/trunk/sound/soc/tegra/tegra20_i2s.c
@@ -29,15 +29,14 @@
  */
 
 #include <linux/clk.h>
-#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <mach/iomap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/trunk/sound/soc/tegra/tegra20_spdif.c b/trunk/sound/soc/tegra/tegra20_spdif.c
index 052bff816c4d..00a2d33352f4 100644
--- a/trunk/sound/soc/tegra/tegra20_spdif.c
+++ b/trunk/sound/soc/tegra/tegra20_spdif.c
@@ -21,14 +21,13 @@
  */
 
 #include <linux/clk.h>
-#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
+#include <linux/io.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/io.h>
-#include <mach/iomap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/trunk/sound/soc/tegra/tegra_pcm.c b/trunk/sound/soc/tegra/tegra_pcm.c
index 476b8ac3a24d..127348dc09b1 100644
--- a/trunk/sound/soc/tegra/tegra_pcm.c
+++ b/trunk/sound/soc/tegra/tegra_pcm.c
@@ -29,8 +29,8 @@
  *
  */
 
-#include <linux/module.h>
 #include <linux/dma-mapping.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>