Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

This commit is contained in:
Mark Brown 2012-12-10 00:22:17 +09:00
commit ceb8ef5e6d
46 changed files with 299 additions and 164 deletions

View file

@ -38,12 +38,6 @@ struct samsung_i2s {
#define QUIRK_NEED_RSTCLR (1 << 3)
/* Quirks of the I2S controller */
u32 quirks;
/*
* Array of clock names that can be used to generate I2S signals.
* Also corresponds to clocks of I2SMOD[10]
*/
const char **src_clk;
dma_addr_t idma_addr;
};