Commit 2c8e9927 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood

omap: zoom2: Fix ASoC multi-component build breakage by removing dead code

ASoC Multi-Component Support patch removes #if 0 in board-zoom2.c that was
used to protect some uncompiling dead code. Remove that code as it seems to
be here quite some time since commit 479f12c9.
Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Cc: Vikram Pandita <vikram.pandita@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Tested-by: default avatarMisael Lopez Cruz <misael.lopez@ti.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent fc38a8a1
...@@ -41,10 +41,6 @@ void zoom2_set_hs_extmute(int mute) ...@@ -41,10 +41,6 @@ void zoom2_set_hs_extmute(int mute)
gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
} }
static struct twl4030_madc_platform_data zoom2_madc_data = {
.irq_line = 1,
};
static struct twl4030_codec_audio_data zoom2_audio_data = { static struct twl4030_codec_audio_data zoom2_audio_data = {
.audio_mclk = 26000000, .audio_mclk = 26000000,
.ramp_delay_value = 3, /* 161 ms */ .ramp_delay_value = 3, /* 161 ms */
...@@ -62,15 +58,7 @@ static struct twl4030_platform_data zoom2_twldata = { ...@@ -62,15 +58,7 @@ static struct twl4030_platform_data zoom2_twldata = {
.irq_end = TWL4030_IRQ_END, .irq_end = TWL4030_IRQ_END,
/* platform_data for children goes here */ /* platform_data for children goes here */
.bci = &zoom2_bci_data,
.madc = &zoom2_madc_data,
.usb = &zoom2_usb_data,
.gpio = &zoom2_gpio_data,
.keypad = &zoom2_kp_twl4030_data,
.codec = &zoom2_codec_data, .codec = &zoom2_codec_data,
.vmmc1 = &zoom2_vmmc1,
.vmmc2 = &zoom2_vmmc2,
.vsim = &zoom2_vsim,
}; };
static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = { static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment