diff options
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/atmel-mci.h | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 21ab782cc8e9..06ecbafd01ee 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/i2c-gpio.h> | 19 | #include <linux/i2c-gpio.h> |
20 | #include <linux/atmel-mci.h> | 20 | #include <linux/atmel-mci.h> |
21 | #include <linux/platform_data/crypto-atmel.h> | 21 | #include <linux/platform_data/crypto-atmel.h> |
22 | #include <linux/platform_data/mmc-atmel-mci.h> | ||
22 | 23 | ||
23 | #include <linux/platform_data/at91_adc.h> | 24 | #include <linux/platform_data/at91_adc.h> |
24 | 25 | ||
@@ -30,7 +31,6 @@ | |||
30 | #include <mach/at91_matrix.h> | 31 | #include <mach/at91_matrix.h> |
31 | #include <mach/at91sam9_smc.h> | 32 | #include <mach/at91sam9_smc.h> |
32 | #include <linux/platform_data/dma-atmel.h> | 33 | #include <linux/platform_data/dma-atmel.h> |
33 | #include <mach/atmel-mci.h> | ||
34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
35 | 35 | ||
36 | #include <media/atmel-isi.h> | 36 | #include <media/atmel-isi.h> |
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h deleted file mode 100644 index 3069e4135573..000000000000 --- a/arch/arm/mach-at91/include/mach/atmel-mci.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef __MACH_ATMEL_MCI_H | ||
2 | #define __MACH_ATMEL_MCI_H | ||
3 | |||
4 | #include <linux/platform_data/dma-atmel.h> | ||
5 | |||
6 | /** | ||
7 | * struct mci_dma_data - DMA data for MCI interface | ||
8 | */ | ||
9 | struct mci_dma_data { | ||
10 | struct at_dma_slave sdata; | ||
11 | }; | ||
12 | |||
13 | /* accessor macros */ | ||
14 | #define slave_data_ptr(s) (&(s)->sdata) | ||
15 | #define find_slave_dev(s) ((s)->sdata.dma_dev) | ||
16 | |||
17 | #endif /* __MACH_ATMEL_MCI_H */ | ||