diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:00:16 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:00:16 +0200 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/arm/pxa2xx-ac97-lib.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
| download | op-kernel-dev-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.zip op-kernel-dev-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.tar.gz | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/arm/pxa2xx-ac97-lib.c')
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 71bef45..a2c12d10 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c @@ -21,7 +21,6 @@ #include <sound/pxa2xx-lib.h> #include <asm/irq.h> -#include <mach/hardware.h> #include <mach/regs-ac97.h> #include <mach/pxa2xx-gpio.h> #include <mach/audio.h> @@ -365,7 +364,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) { int ret; - struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data; + pxa2xx_audio_ops_t *pdata = dev->dev.platform_data; if (pdata) { switch (pdata->reset_gpio) { |
