diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/platform_data/atmel-aes.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/platform_data/atmel-aes.h')
| -rw-r--r-- | include/linux/platform_data/atmel-aes.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |