diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
| commit | 4038a12e7443b5fed3e526c475c38c115d9600f6 (patch) | |
| tree | b39b8fc13c0761459c6bafa1642c6869c4e5747d /sound/soc/fsl/mpc5200_dma.c | |
| parent | ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name (diff) | |
| parent | ASoC: Fix trivial build regression in Kirkwood I2S (diff) | |
| download | linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.tar.xz linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/fsl/mpc5200_dma.c')
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index fd0dc46afc34..5c6c2457386e 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = { .pcm_free = &psc_dma_free, }; -static int mpc5200_hpcd_probe(struct of_device *op) +static int mpc5200_hpcd_probe(struct platform_device *op) { phys_addr_t fifo; struct psc_dma *psc_dma; @@ -487,7 +487,7 @@ out_unmap: return ret; } -static int mpc5200_hpcd_remove(struct of_device *op) +static int mpc5200_hpcd_remove(struct platform_device *op) { struct psc_dma *psc_dma = dev_get_drvdata(&op->dev); @@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match); static struct platform_driver mpc5200_hpcd_of_driver = { .probe = mpc5200_hpcd_probe, .remove = mpc5200_hpcd_remove, - .dev = { + .driver = { .owner = THIS_MODULE, .name = "mpc5200-pcm-audio", .of_match_table = mpc5200_hpcd_match, |