From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 25 Mar 2006 22:08:55 +0000 (+0000)
Subject: Merge nommu tree
X-Git-Tag: v2.6.17-rc1~661^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0003cedfc577be9d679c16531f8720739e9637ed;p=linux-2.6

Merge nommu tree

Fix merge conflict in arch/arm/mm/proc-xscale.S

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

0003cedfc577be9d679c16531f8720739e9637ed
diff --cc arch/arm/mm/proc-arm920.S
index 950d3b664c,e57d3b8de4..a17f79e019
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@@ -28,8 -28,10 +28,9 @@@
  #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/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"
diff --cc arch/arm/mm/proc-arm922.S
index 410b032faa,3170b37f82..bbde4a024a
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@@ -29,8 -29,10 +29,9 @@@
  #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/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"
diff --cc arch/arm/mm/proc-arm925.S
index 6dd2be7cd0,eb78850add..224ce226a0
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@@ -51,8 -51,10 +51,9 @@@
  #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/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"
diff --cc arch/arm/mm/proc-arm926.S
index 022e868420,23ad5027d9..4e2a087cf3
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@@ -28,8 -28,10 +28,9 @@@
  #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/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"
diff --cc arch/arm/mm/proc-xscale.S
index b50f87a0ee,3e7e6a8f41..29bcc4dd65
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@@ -24,7 -24,9 +24,8 @@@
  #include <linux/init.h>
  #include <asm/assembler.h>
  #include <asm/procinfo.h>
 -#include <asm/hardware.h>
 -#include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
++#include <asm/pgtable-hwdef.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"