diff options
| author | Peter Huewe <PeterHuewe@gmx.de> | 2009-12-25 20:08:45 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-28 11:24:09 +0100 |
| commit | 754a00aeb26bcc8bf82897538a078bc84a6d95c7 (patch) | |
| tree | 8afa6fb4cedd3cf4496e19f659928373c66af1af /arch/avr32 | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
| download | kernel_samsung_aries-754a00aeb26bcc8bf82897538a078bc84a6d95c7.zip kernel_samsung_aries-754a00aeb26bcc8bf82897538a078bc84a6d95c7.tar.gz kernel_samsung_aries-754a00aeb26bcc8bf82897538a078bc84a6d95c7.tar.bz2 | |
arch/avr32: Fix build failure for avr32 caused by typo
This patch fixes a build failure introduced by the patch
atmel-mci: change use of dma slave interface by Nicolas Ferre
by changing mci_dma_slave to the correct name of mci_dma_data
This should make the avr32 tree build again.
References:
http://kisskb.ellerman.id.au/kisskb/buildresult/1893610/
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=2635d1ba711560d521f6218c585a3e0401f566e1
Patch against Linus' tree.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 1aa1ea5..7d4ed42 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c @@ -1325,7 +1325,7 @@ struct platform_device *__init at32_add_device_mci(unsigned int id, struct mci_platform_data *data) { struct platform_device *pdev; - struct mci_dma_slave *slave; + struct mci_dma_data *slave; u32 pioa_mask; u32 piob_mask; @@ -1344,7 +1344,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) ARRAY_SIZE(atmel_mci0_resource))) goto fail; - slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL); + slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL); slave->sdata.dma_dev = &dw_dmac0_device.dev; slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT; |