From: Stephen Warren swarren@nvidia.com

Signed-off-by: Stephen Warren swarren@nvidia.com --- sound/soc/tegra/tegra20_das.c | 5 ++--- sound/soc/tegra/tegra20_i2s.c | 7 +++---- sound/soc/tegra/tegra20_spdif.c | 5 ++--- sound/soc/tegra/tegra_pcm.c | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index 486d7b2..812696d 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 878798c..9427f36 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 052bff8..00a2d33 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 476b8ac..127348d 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>