diff options
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9rl_devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/atmel-mci.h | 2 | ||||
| -rw-r--r-- | drivers/dma/at_hdmac_regs.h | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/atmel-aes.h | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/dma-atmel.h (renamed from arch/arm/mach-at91/include/mach/at_hdmac.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 06073996a382..0aa9bdb75576 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <mach/at91sam9g45_matrix.h> | 31 | #include <mach/at91sam9g45_matrix.h> |
| 32 | #include <mach/at91_matrix.h> | 32 | #include <mach/at91_matrix.h> |
| 33 | #include <mach/at91sam9_smc.h> | 33 | #include <mach/at91sam9_smc.h> |
| 34 | #include <mach/at_hdmac.h> | 34 | #include <linux/platform_data/dma-atmel.h> |
| 35 | #include <mach/atmel-mci.h> | 35 | #include <mach/atmel-mci.h> |
| 36 | 36 | ||
| 37 | #include <media/atmel-isi.h> | 37 | #include <media/atmel-isi.h> |
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index f09fff932172..e4da7179e545 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <mach/at91sam9rl_matrix.h> | 22 | #include <mach/at91sam9rl_matrix.h> |
| 23 | #include <mach/at91_matrix.h> | 23 | #include <mach/at91_matrix.h> |
| 24 | #include <mach/at91sam9_smc.h> | 24 | #include <mach/at91sam9_smc.h> |
| 25 | #include <mach/at_hdmac.h> | 25 | #include <linux/platform_data/dma-atmel.h> |
| 26 | 26 | ||
| 27 | #include "generic.h" | 27 | #include "generic.h" |
| 28 | 28 | ||
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h index 998cb0c07135..cd580a12e904 100644 --- a/arch/arm/mach-at91/include/mach/atmel-mci.h +++ b/arch/arm/mach-at91/include/mach/atmel-mci.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __MACH_ATMEL_MCI_H | 1 | #ifndef __MACH_ATMEL_MCI_H |
| 2 | #define __MACH_ATMEL_MCI_H | 2 | #define __MACH_ATMEL_MCI_H |
| 3 | 3 | ||
| 4 | #include <mach/at_hdmac.h> | 4 | #include <linux/platform_data/dma-atmel.h> |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
| 7 | * struct mci_dma_data - DMA data for MCI interface | 7 | * struct mci_dma_data - DMA data for MCI interface |
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h index 8a6c8e8b2940..116e4adffb08 100644 --- a/drivers/dma/at_hdmac_regs.h +++ b/drivers/dma/at_hdmac_regs.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef AT_HDMAC_REGS_H | 11 | #ifndef AT_HDMAC_REGS_H |
| 12 | #define AT_HDMAC_REGS_H | 12 | #define AT_HDMAC_REGS_H |
| 13 | 13 | ||
| 14 | #include <mach/at_hdmac.h> | 14 | #include <linux/platform_data/dma-atmel.h> |
| 15 | 15 | ||
| 16 | #define AT_DMA_MAX_NR_CHANNELS 8 | 16 | #define AT_DMA_MAX_NR_CHANNELS 8 |
| 17 | 17 | ||
diff --git a/include/linux/platform_data/atmel-aes.h b/include/linux/platform_data/atmel-aes.h index e7a1949bad26..ab68082fbcb0 100644 --- a/include/linux/platform_data/atmel-aes.h +++ b/include/linux/platform_data/atmel-aes.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __LINUX_ATMEL_AES_H | 1 | #ifndef __LINUX_ATMEL_AES_H |
| 2 | #define __LINUX_ATMEL_AES_H | 2 | #define __LINUX_ATMEL_AES_H |
| 3 | 3 | ||
| 4 | #include <mach/at_hdmac.h> | 4 | #include <linux/platform_data/dma-atmel.h> |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
| 7 | * struct aes_dma_data - DMA data for AES | 7 | * struct aes_dma_data - DMA data for AES |
diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/include/linux/platform_data/dma-atmel.h index cab0997be3de..cab0997be3de 100644 --- a/arch/arm/mach-at91/include/mach/at_hdmac.h +++ b/include/linux/platform_data/dma-atmel.h | |||