summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-04-06 19:12:25 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-06 19:22:06 +0200
commit7613c508dfd7880cb7e17ad5eb64b9dfb0b80292 (patch)
tree008acf7334b0ebc23ca7b93103f8e9949b45b6ca
parentASoC: JZ4740: Replaced comma operators with semicolons. (diff)
downloadlinux-7613c508dfd7880cb7e17ad5eb64b9dfb0b80292.tar.xz
linux-7613c508dfd7880cb7e17ad5eb64b9dfb0b80292.zip
ASoC: tegra: sort includes, remove mach/iomap.h
Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/tegra/tegra20_das.c5
-rw-r--r--sound/soc/tegra/tegra20_i2s.c7
-rw-r--r--sound/soc/tegra/tegra20_spdif.c5
-rw-r--r--sound/soc/tegra/tegra_pcm.c2
4 files changed, 8 insertions, 11 deletions
diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c
index 486d7b245cf4..812696d9c863 100644
--- a/sound/soc/tegra/tegra20_das.c
+++ b/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/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 878798c89e49..9427f36e6a25 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/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/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 052bff816c4d..00a2d33352f4 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/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/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
index 476b8ac3a24d..127348dc09b1 100644
--- a/sound/soc/tegra/tegra_pcm.c
+++ b/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>