Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index c071f9603a380b4688e36fe8525ad87301e1b5cb..3c85c0f92823b82a87affec967b663966c279f4d 100644 (file)
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -24,7 +24,7 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
@@ -321,11 +321,11 @@ static int __init sdp3430_soc_init(void)
        *(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; /* McBSP3 */
 
        /* Set TWL4030 GPIO6 as EXTMUTE signal */
-       twl4030_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
+       twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
                                                TWL4030_INTBR_PMBR1);
        pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03);
        pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02);
-       twl4030_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
+       twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
                                                TWL4030_INTBR_PMBR1);
 
        ret = platform_device_add(sdp3430_snd_device);