Merge branch 'topic/workq-update' into topic/misc

This commit is contained in:
Takashi Iwai 2010-12-13 09:29:52 +01:00
commit 354d14b3f5
1532 changed files with 28025 additions and 13727 deletions

View file

@ -85,7 +85,9 @@
* ACK_MD (FSI2)
* CKG1 (FSI)
*
* err: return value < 0
* err : return value < 0
* no change : return value == 0
* change xMD : return value > 0
*
* 0x-00000AB
*
@ -111,7 +113,7 @@
struct sh_fsi_platform_info {
unsigned long porta_flags;
unsigned long portb_flags;
int (*set_rate)(int is_porta, int rate); /* for master mode */
int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
};
#endif /* __SOUND_FSI_H */