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 branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
arm
/
mach-netx
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-netx/include/mach/system.h
b/arch/arm/mach-netx/include/mach/system.h
index
27d8ef8
..
6c1023b
100644
(file)
--- a/
arch/arm/mach-netx/include/mach/system.h
+++ b/
arch/arm/mach-netx/include/mach/system.h
@@
-19,7
+19,7
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <mach/hardware.h>
#include "netx-regs.h"