git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91sam9rl_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9rl_devices.c
b/arch/arm/mach-at91/at91sam9rl_devices.c
index
1fad22f
..
deafea0
100644
(file)
--- a/
arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/
arch/arm/mach-at91/at91sam9rl_devices.c
@@
-22,7
+22,7
@@
#include <mach/at91sam9rl_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 "generic.h"