diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-10-17 10:26:38 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-10 12:40:38 +0100 |
| commit | 4df10e02aa92a2f898da408e9b8ef9a73e7f7264 (patch) | |
| tree | 0eef403515fb4b584205e526c3746383d28f6218 /arch/avr32 | |
| parent | 19336880bf21709fa419245435e9424afdb5d3ea (diff) | |
| download | lwn-4df10e02aa92a2f898da408e9b8ef9a73e7f7264.tar.gz lwn-4df10e02aa92a2f898da408e9b8ef9a73e7f7264.zip | |
avr32: remove mach/atmel-mci.h
Use the generic platform_data header file instead of mach/atmel-mci.h
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 37b75602adf6..cc92cdb9994c 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c @@ -17,7 +17,7 @@ #include <linux/spi/spi.h> #include <linux/usb/atmel_usba_udc.h> -#include <mach/atmel-mci.h> +#include <linux/platform_data/mmc-atmel-mci.h> #include <linux/atmel-mci.h> #include <asm/io.h> diff --git a/arch/avr32/mach-at32ap/include/mach/atmel-mci.h b/arch/avr32/mach-at32ap/include/mach/atmel-mci.h deleted file mode 100644 index 11d7f4b28dc8..000000000000 --- a/arch/avr32/mach-at32ap/include/mach/atmel-mci.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __MACH_ATMEL_MCI_H -#define __MACH_ATMEL_MCI_H - -#include <linux/platform_data/dma-dw.h> - -/** - * struct mci_dma_data - DMA data for MCI interface - */ -struct mci_dma_data { - struct dw_dma_slave sdata; -}; - -/* accessor macros */ -#define slave_data_ptr(s) (&(s)->sdata) -#define find_slave_dev(s) ((s)->sdata.dma_dev) - -#endif /* __MACH_ATMEL_MCI_H */ |