projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
board-rx51-peripherals.c
diff --git
a/arch/arm/mach-omap2/board-rx51-peripherals.c
b/arch/arm/mach-omap2/board-rx51-peripherals.c
index
07005fe
..
60529e0
100644
(file)
--- a/
arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/
arch/arm/mach-omap2/board-rx51-peripherals.c
@@
-31,7
+31,7
@@
#include <asm/system_info.h>
#include "common.h"
-#include <
plat-omap/dma-omap
.h>
+#include <
linux/omap-dma
.h>
#include "gpmc-smc91x.h"
#include "board-rx51.h"