diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
| commit | 1c49cb09b5666aa0d6df3b58f6c621df92c5dd44 (patch) | |
| tree | d6a35f8063d31033bf8059a296ba8dfbf046a373 /include/linux/i2c | |
| parent | d79a08c56985fd3d7bd158687a1a162697935349 (diff) | |
| parent | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (diff) | |
Merge commit '05f6894' (omap-for-linus) into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/include/plat/usb.h
drivers/usb/musb/musb_core.h
Diffstat (limited to 'include/linux/i2c')
| -rw-r--r-- | include/linux/i2c/twl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index a4bd05b7bd2..58afd9d2c43 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -639,7 +639,6 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); extern int twl4030_remove_script(u8 flags); struct twl4030_codec_audio_data { - unsigned int audio_mclk; /* not used, will be removed */ unsigned int digimic_delay; /* in ms */ unsigned int ramp_delay_value; unsigned int offset_cncl_path; @@ -650,7 +649,6 @@ struct twl4030_codec_audio_data { }; struct twl4030_codec_vibra_data { - unsigned int audio_mclk; unsigned int coexist; }; |