projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
[cascardo/linux.git]
/
arch
/
arm
/
mach-netx
/
nxdb500.c
diff --git
a/arch/arm/mach-netx/nxdb500.c
b/arch/arm/mach-netx/nxdb500.c
index
180ea89
..
8b781ff
100644
(file)
--- a/
arch/arm/mach-netx/nxdb500.c
+++ b/
arch/arm/mach-netx/nxdb500.c
@@
-30,7
+30,7
@@
#include <asm/mach/arch.h>
#include <asm/hardware/vic.h>
#include <mach/netx-regs.h>
-#include <
mach/eth
.h>
+#include <
linux/platform_data/eth-netx
.h>
#include "generic.h"
#include "fb.h"