- Update non unified kernels to build for 3.7 (always OMAP) - Remove old ARM patches, add new to fix 3.7 build - Disable perf on ARM temporarily as the uapi / asm-generic changes break it
23 lines
627 B
Diff
23 lines
627 B
Diff
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>
|