projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
[~shefty/rdma-dev.git]
/
arch
/
arm
/
mach-at91
/
at91sam9g45_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9g45_devices.c
b/arch/arm/mach-at91/at91sam9g45_devices.c
index 0fcd8718770f3592c0238bcbd8966d4d2eee2f3d..b1596072dcc23cd1414a8449eb4c25a35ed11222 100644
(file)
--- a/
arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/
arch/arm/mach-at91/at91sam9g45_devices.c
@@
-31,7
+31,7
@@
#include <mach/at91sam9g45_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
-#include <
mach/at_hdmac
.h>
+#include <
linux/platform_data/dma-atmel
.h>
#include <mach/atmel-mci.h>
#include <media/atmel-isi.h>