diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-28 03:05:22 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-28 06:37:36 -0500 |
commit | d4d9820b4ad6d6227cad090a9f695eea37814215 (patch) | |
tree | a402aff7c81250c18cf7485e5b37201e770ad6b3 /sound/soc/kirkwood | |
parent | 6ab7e71a9cbcd31f5ee09da384bcfcf0fa11b8c9 (diff) |
ASoC: Fix build error in sound/soc/kirkwood/kirkwood-i2s.c
Since commit db33f4de "ARM: Orion: Remove address map info from all platform data structures",
the dram is removed from struct kirkwood_asoc_platform_data.
This patch fixes below build error:
CC sound/soc/kirkwood/kirkwood-i2s.o
sound/soc/kirkwood/kirkwood-i2s.c: In function 'kirkwood_i2s_dev_probe':
sound/soc/kirkwood/kirkwood-i2s.c:444: error: 'struct kirkwood_asoc_platform_data' has no member named 'dram'
sound/soc/kirkwood/kirkwood-i2s.c:450: error: 'struct kirkwood_asoc_platform_data' has no member named 'dram'
make[3]: *** [sound/soc/kirkwood/kirkwood-i2s.o] Error 1
make[2]: *** [sound/soc/kirkwood] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 3 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index f6bb21156876..3cb9aa4299d3 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c | |||
@@ -441,13 +441,12 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev) | |||
441 | goto err_ioremap; | 441 | goto err_ioremap; |
442 | } | 442 | } |
443 | 443 | ||
444 | if (!data || !data->dram) { | 444 | if (!data) { |
445 | dev_err(&pdev->dev, "no platform data ?!\n"); | 445 | dev_err(&pdev->dev, "no platform data ?!\n"); |
446 | err = -EINVAL; | 446 | err = -EINVAL; |
447 | goto err_ioremap; | 447 | goto err_ioremap; |
448 | } | 448 | } |
449 | 449 | ||
450 | priv->dram = data->dram; | ||
451 | priv->burst = data->burst; | 450 | priv->burst = data->burst; |
452 | 451 | ||
453 | return snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai); | 452 | return snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai); |
diff --git a/sound/soc/kirkwood/kirkwood.h b/sound/soc/kirkwood/kirkwood.h index bb6e6a5648c9..9047436b3937 100644 --- a/sound/soc/kirkwood/kirkwood.h +++ b/sound/soc/kirkwood/kirkwood.h | |||
@@ -123,7 +123,6 @@ struct kirkwood_dma_data { | |||
123 | void __iomem *io; | 123 | void __iomem *io; |
124 | int irq; | 124 | int irq; |
125 | int burst; | 125 | int burst; |
126 | struct mbus_dram_target_info *dram; | ||
127 | }; | 126 | }; |
128 | 127 | ||
129 | #endif | 128 | #endif |