summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-03 09:31:02 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-27 22:41:07 +0100
commit257d36fd696d76b622539c26af652d2a8a931ce9 (patch)
treee5070e3b2dbe4dd4b55bf0c7589047872d96aaee
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
downloadop-kernel-dev-257d36fd696d76b622539c26af652d2a8a931ce9.zip
op-kernel-dev-257d36fd696d76b622539c26af652d2a8a931ce9.tar.gz
ASoC: zoom2: Fix compile error by including correct header files
Also drop the includes that are no longer needed and just cause problems for the ARM common zImage. Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> [tony@atomide.com: updated to drop unneeded headers] Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/omap/zoom2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 677b567..1ff6bb9 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -21,15 +21,14 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
+#include <linux/gpio.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/soc.h>
#include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <mach/board-zoom.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/platform_data/gpio-omap.h>
/* Register descriptions for twl4030 codec part */
#include <linux/mfd/twl4030-audio.h>
OpenPOWER on IntegriCloud