git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom-peripherals.c
diff --git
a/arch/arm/mach-omap2/board-zoom-peripherals.c
b/arch/arm/mach-omap2/board-zoom-peripherals.c
index
13a6442
..
6d0aa4f
100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/
arch/arm/mach-omap2/board-zoom-peripherals.c
@@
-274,12
+274,12
@@
static int __init omap_i2c_init(void)
TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
if (machine_is_omap_zoom2()) {
TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
if (machine_is_omap_zoom2()) {
- struct twl4030_codec_
audio_data *audio
_data;
-
audio_data = zoom_twldata.codec->audio
;
+ struct twl4030_codec_
data *codec
_data;
+
codec_data = zoom_twldata.audio->codec
;
-
audio
_data->ramp_delay_value = 3; /* 161 ms */
-
audio
_data->hs_extmute = 1;
-
audio
_data->set_hs_extmute = zoom2_set_hs_extmute;
+
codec
_data->ramp_delay_value = 3; /* 161 ms */
+
codec
_data->hs_extmute = 1;
+
codec
_data->set_hs_extmute = zoom2_set_hs_extmute;
}
omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);
omap_register_i2c_bus(2, 400, NULL, 0);
}
omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);
omap_register_i2c_bus(2, 400, NULL, 0);