Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[karo-tx-linux.git] / sound / soc / omap / zoom2.c

diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 920e0d9e03db1531ff994156c2a02a3120af447f..677b567935f8055b6899f74e276bd4c0a39dd213 100644 (file)
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -29,7 +29,7 @@
 #include <mach/hardware.h>
 #include <mach/gpio.h>
 #include <mach/board-zoom.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/asoc-ti-mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-audio.h>
@@ -191,9 +191,6 @@ static int __init zoom2_soc_init(void)
        BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0);
        gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0);
 
-       BUG_ON(gpio_request(ZOOM2_HEADSET_EXTMUTE_GPIO, "ext_mute") < 0);
-       gpio_direction_output(ZOOM2_HEADSET_EXTMUTE_GPIO, 0);
-
        return 0;
 
 err1:
@@ -207,7 +204,6 @@ module_init(zoom2_soc_init);
 static void __exit zoom2_soc_exit(void)
 {
        gpio_free(ZOOM2_HEADSET_MUX_GPIO);
-       gpio_free(ZOOM2_HEADSET_EXTMUTE_GPIO);
 
        platform_device_unregister(zoom2_snd_device);
 }