forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

Browse source 
Conflicts:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
This commit is contained in:
Tony Lindgren 2011-03-02 17:11:18 -08:00
commit b2833a0578
54 changed files with 2629 additions and 1202 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/i2c/twl.h
View file

@ -637,7 +637,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;
@ -648,7 +647,6 @@ struct twl4030_codec_audio_data {
};
struct twl4030_codec_vibra_data {
unsigned int audio_mclk;
unsigned int coexist;
};