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 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[cascardo/linux.git]
/
arch
/
x86
/
mm
/
mmio-mod.c
diff --git
a/arch/x86/mm/mmio-mod.c
b/arch/x86/mm/mmio-mod.c
index
3adff7d
..
67421f3
100644
(file)
--- a/
arch/x86/mm/mmio-mod.c
+++ b/
arch/x86/mm/mmio-mod.c
@@
-34,7
+34,7
@@
#include <asm/pgtable.h>
#include <linux/mmiotrace.h>
#include <asm/e820.h> /* for ISA_START_ADDRESS */
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <linux/percpu.h>
#include <linux/cpu.h>