projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-defconfig64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-orion5x
/
tsx09-common.c
diff --git
a/arch/arm/mach-orion5x/tsx09-common.c
b/arch/arm/mach-orion5x/tsx09-common.c
index d42e006597c7b1e1cf4078972669b0cec3bfd6d0..89774985d3803fbc8c84a7eb993a7d3e18bf0d75 100644
(file)
--- a/
arch/arm/mach-orion5x/tsx09-common.c
+++ b/
arch/arm/mach-orion5x/tsx09-common.c
@@
-15,7
+15,7
@@
#include <linux/mv643xx_eth.h>
#include <linux/timex.h>
#include <linux/serial_reg.h>
-#include
<mach/orion5x.h>
+#include
"orion5x.h"
#include "tsx09-common.h"
#include "common.h"