git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mm
/
proc-arm925.S
diff --git
a/arch/arm/mm/proc-arm925.S
b/arch/arm/mm/proc-arm925.S
index
ee49aa2
..
224ce22
100644
(file)
--- a/
arch/arm/mm/proc-arm925.S
+++ b/
arch/arm/mm/proc-arm925.S
@@
-51,9
+51,9
@@
#include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h>
#include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h>
+#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include <asm/procinfo.h>
#include <asm/pgtable.h>
#include <asm/procinfo.h>
-#include <asm/hardware.h>
#include <asm/page.h>
#include <asm/ptrace.h>
#include "proc-macros.S"
#include <asm/page.h>
#include <asm/ptrace.h>
#include "proc-macros.S"
@@
-521,7
+521,7
@@
cpu_arm925_name:
.align
.align
- .section ".proc.info", #alloc, #execinstr
+ .section ".proc.info
.init
", #alloc, #execinstr
.type __arm925_proc_info,#object
__arm925_proc_info:
.type __arm925_proc_info,#object
__arm925_proc_info: