Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40
This commit is contained in:
commit
b06c16dc32
|
@ -820,7 +820,7 @@ struct soc_enum {
|
||||||
unsigned char shift_r;
|
unsigned char shift_r;
|
||||||
unsigned int max;
|
unsigned int max;
|
||||||
unsigned int mask;
|
unsigned int mask;
|
||||||
const char **texts;
|
const char * const *texts;
|
||||||
const unsigned int *values;
|
const unsigned int *values;
|
||||||
void *dapm;
|
void *dapm;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue