git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mm
/
proc-arm940.S
diff --git
a/arch/arm/mm/proc-arm940.S
b/arch/arm/mm/proc-arm940.S
index 551244d5ca19eb1a20bfde7a5661606aff9cfbec..f595117caf55bb7db716b29e477c7c0f9f49bb95 100644
(file)
--- a/
arch/arm/mm/proc-arm940.S
+++ b/
arch/arm/mm/proc-arm940.S
@@
-11,7
+11,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>