diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-11 12:17:14 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-11 12:17:14 +0200 |
commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/tegra/tegra_alc5632.c | |
parent | Linux 3.11 (diff) | |
parent | ASoC: atmel: disable error interrupt (diff) | |
download | linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.xz linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/tegra/tegra_alc5632.c')
-rw-r--r-- | sound/soc/tegra/tegra_alc5632.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 48d05d9e1002..c61ea3a1030f 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -13,8 +13,6 @@ * published by the Free Software Foundation. */ -#include <asm/mach-types.h> - #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> |