diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:19 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:19 -0400 |
| commit | 13b137ef0367237909bb2dc38babfb8305154676 (patch) | |
| tree | a5d756fcc6603da970ef8c5e263244c6166a2fba /sound/soc/codecs/ak4641.c | |
| parent | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (diff) | |
| parent | 440085598672c0e3fde8a48495f61fea418b06d1 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/ak4641.c')
| -rw-r--r-- | sound/soc/codecs/ak4641.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c index ed96f247c2da..7a64e58cddc4 100644 --- a/sound/soc/codecs/ak4641.c +++ b/sound/soc/codecs/ak4641.c | |||
| @@ -457,7 +457,7 @@ static struct snd_soc_dai_ops ak4641_pcm_dai_ops = { | |||
| 457 | .set_sysclk = ak4641_set_dai_sysclk, | 457 | .set_sysclk = ak4641_set_dai_sysclk, |
| 458 | }; | 458 | }; |
| 459 | 459 | ||
| 460 | struct snd_soc_dai_driver ak4641_dai[] = { | 460 | static struct snd_soc_dai_driver ak4641_dai[] = { |
| 461 | { | 461 | { |
| 462 | .name = "ak4641-hifi", | 462 | .name = "ak4641-hifi", |
| 463 | .id = 1, | 463 | .id = 1, |