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 'topic/oss' into for-linus
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
pgtable.h
diff --git
a/arch/ia64/include/asm/pgtable.h
b/arch/ia64/include/asm/pgtable.h
index
0a9cc73
..
8840a69
100644
(file)
--- a/
arch/ia64/include/asm/pgtable.h
+++ b/
arch/ia64/include/asm/pgtable.h
@@
-155,7
+155,6
@@
#include <linux/bitops.h>
#include <asm/cacheflush.h>
#include <asm/mmu_context.h>
-#include <asm/processor.h>
/*
* Next come the mappings that determine how mmap() protection bits