diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-20 14:03:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-20 14:03:04 +0100 |
| commit | 64bd43a086469a0bfdd87e012523184bdd96ce81 (patch) | |
| tree | f44ff7df4bae5ac265f68885663a790885895666 /sound/arm/pxa2xx-ac97-lib.c | |
| parent | 4a014a240b5a3c3b167702948a22dbe9e9a150a8 (diff) | |
| parent | a48dc30da44769ea3f3562c18f54878a9a3e78a1 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 0afd1a8226f..a2c12d105c9 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); 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) { |