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 'topic/fix/hda' and 'topic/fix/misc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-arm946.S
diff --git
a/arch/arm/mm/proc-arm946.S
b/arch/arm/mm/proc-arm946.S
index
6168c61
..
e03f6ff
100644
(file)
--- a/
arch/arm/mm/proc-arm946.S
+++ b/
arch/arm/mm/proc-arm946.S
@@
-13,7
+13,7
@@
#include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h>
-#include <asm/
elf
.h>
+#include <asm/
hwcap
.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include <asm/ptrace.h>