Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
To modify Ixia port numbers and IP in pod.yaml
[kvmfornfv.git]
/
kernel
/
arch
/
cris
/
include
/
asm
/
io.h
diff --git
a/kernel/arch/cris/include/asm/io.h
b/kernel/arch/cris/include/asm/io.h
index
752a3f4
..
cce8664
100644
(file)
--- a/
kernel/arch/cris/include/asm/io.h
+++ b/
kernel/arch/cris/include/asm/io.h
@@
-2,7
+2,9
@@
#define _ASM_CRIS_IO_H
#include <asm/page.h> /* for __va, __pa */
+#ifdef CONFIG_ETRAX_ARCH_V10
#include <arch/io.h>
+#endif
#include <asm-generic/iomap.h>
#include <linux/kernel.h>