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 with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mm
/
proc-xscale.S
diff --git
a/arch/arm/mm/proc-xscale.S
b/arch/arm/mm/proc-xscale.S
index 2d3823ec315384e5bc117184b8ae33f5d6fa0e51..29bcc4dd65178a99cd640e4fc4fd715b97453e00 100644
(file)
--- a/
arch/arm/mm/proc-xscale.S
+++ b/
arch/arm/mm/proc-xscale.S
@@
-24,8
+24,8
@@
#include <linux/init.h>
#include <asm/assembler.h>
#include <asm/procinfo.h>
-#include <asm/hardware.h>
#include <asm/pgtable.h>
+#include <asm/pgtable-hwdef.h>
#include <asm/page.h>
#include <asm/ptrace.h>
#include "proc-macros.S"