diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:48 +0200 |
| commit | 9430148d800dd929ad73da4c6afb67f793f8af43 (patch) | |
| tree | 437d0aec41428cbb310a202100ba581c63fbe89e /sound/soc/pxa/z2.c | |
| parent | d22665702226e9c40bc331098559e3d55e7cd43d (diff) | |
| parent | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (diff) | |
Merge branch 'topic/remove-irqf_disable' into for-linus
Diffstat (limited to 'sound/soc/pxa/z2.c')
| -rw-r--r-- | sound/soc/pxa/z2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index d69d9fc3223..4b81ffd8756 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -198,7 +198,7 @@ static struct snd_soc_dai_link z2_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750-codec.0-001b", + .codec_name = "wm8750.0-001b", .init = z2_wm8750_init, .ops = &z2_ops, }; |