diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:36:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:36:41 -0400 |
| commit | 6ae85d6db4871d8dbcb5cc0e9056f97f1ca07061 (patch) | |
| tree | d0a6fa2e4fcef36a4c80990a361c0d5fbe091c35 /sound/arm/pxa2xx-ac97-lib.c | |
| parent | d72cd3a90e4d6725b62919139e2ab7bd926fa16d (diff) | |
| parent | fdd8b079e33d4711527ace19798e9db99a056469 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5460/1: Orion: reduce namespace pollution
[ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
[ARM] 5457/1: mach-imx gpio buildfix
[ARM] 5456/1: add sys_preadv and sys_pwritev
[ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
[ARM] pxa/palm27x: General fix for Palm27x aSoC driver
[ARM] pxa/mioa701: use GPIO95 as AC97 reset line
[ARM] pxa: merge AC97 platform data structures
[ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h
Diffstat (limited to 'sound/arm/pxa2xx-ac97-lib.c')
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 0afd1a8226fb..a2c12d105c9a 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
| @@ -364,7 +364,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); | |||
| 364 | int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) | 364 | int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) |
| 365 | { | 365 | { |
| 366 | int ret; | 366 | int ret; |
| 367 | struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data; | 367 | pxa2xx_audio_ops_t *pdata = dev->dev.platform_data; |
| 368 | 368 | ||
| 369 | if (pdata) { | 369 | if (pdata) { |
| 370 | switch (pdata->reset_gpio) { | 370 | switch (pdata->reset_gpio) { |