Merge branch 'topic/asoc' into for-linus

This commit is contained in:
Takashi Iwai 2010-03-01 12:38:59 +01:00
commit 6679ee1870
103 changed files with 19996 additions and 3338 deletions

View file

@ -547,6 +547,10 @@ struct twl4030_codec_data {
unsigned int audio_mclk;
struct twl4030_codec_audio_data *audio;
struct twl4030_codec_vibra_data *vibra;
/* twl6030 */
int audpwron_gpio; /* audio power-on gpio */
int naudint_irq; /* audio interrupt */
};
struct twl4030_platform_data {