diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:36:05 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:44:30 -0500 |
| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /sound/soc/pxa/poodle.c | |
| parent | fe16d949b45036d9f80e20e07bde1ddacc930b10 (diff) | |
| parent | 452858338aec31c1f4414bf07f31663690479869 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'sound/soc/pxa/poodle.c')
| -rw-r--r-- | sound/soc/pxa/poodle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6298ee115e27..a7d4999f9b24 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
| @@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { | |||
| 276 | .cpu_dai_name = "pxa2xx-i2s", | 276 | .cpu_dai_name = "pxa2xx-i2s", |
| 277 | .codec_dai_name = "wm8731-hifi", | 277 | .codec_dai_name = "wm8731-hifi", |
| 278 | .platform_name = "pxa-pcm-audio", | 278 | .platform_name = "pxa-pcm-audio", |
| 279 | .codec_name = "wm8731-codec.0-001a", | 279 | .codec_name = "wm8731-codec.0-001b", |
| 280 | .init = poodle_wm8731_init, | 280 | .init = poodle_wm8731_init, |
| 281 | .ops = &poodle_ops, | 281 | .ops = &poodle_ops, |
| 282 | }; | 282 | }; |