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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
debugport.c
diff --git
a/arch/cris/arch-v32/kernel/debugport.c
b/arch/cris/arch-v32/kernel/debugport.c
index
15af4c2
..
794b364
100644
(file)
--- a/
arch/cris/arch-v32/kernel/debugport.c
+++ b/
arch/cris/arch-v32/kernel/debugport.c
@@
-9,7
+9,7
@@
#include <hwregs/reg_map.h>
#include <hwregs/ser_defs.h>
#include <hwregs/dma_defs.h>
-#include <
asm/arch/
mach/pinmux.h>
+#include <mach/pinmux.h>
struct dbg_port
{