Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 754a00ae authored by Peter Huewe's avatar Peter Huewe Committed by Haavard Skinnemoen
Browse files

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: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
parent 6b7b2849

arch/avr32/mach-at32ap/at32ap700x.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1325,7 +1325,7 @@ struct platform_device *__init 
at32_add_device_mci(unsigned int id, struct mci_platform_data *data)

at32_add_device_mci(unsigned int id, struct mci_platform_data *data)

{

{

	struct platform_device		*pdev;

	struct platform_device		*pdev;

	struct mci_dma_slave		*slave;

	struct mci_dma_data	        *slave;

	u32				pioa_mask;

	u32				pioa_mask;

	u32				piob_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)))

				ARRAY_SIZE(atmel_mci0_resource)))

		goto fail;

		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.dma_dev = &dw_dmac0_device.dev;

	slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;

	slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;