[ARM PATCH] 2113/1: include asm/arch/pxa-regs.h where necessary

Patch from Ian Campbell

The include of asm/arch/pxa-regs.h has been removed from
asm-arm/arch-pxa/hardware.h and now needs to be included
from the relevant files.

I have verified the fixes to arch/arm/mach-pxa/sleep.S and
drivers/char/watchdog/sa1100_wdt.c myself. My local tree
has other changes to include/asm-arm/arch-pxa/serial.h
but I beleive that the attached is necessary and correct.

Signed-off-by: Ian Campbell

diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index 1892639394fc1d9cd9adcfd1d6029a14d4ffa805..3ba0d35728568866fcfb993843f32ba4e159a798 100644 (file)
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -16,6 +16,8 @@
 #include <asm/assembler.h>
 #include <asm/hardware.h>
 
+#include <asm/arch/pxa-regs.h>
+
                .text
 
 /*

diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index b9e76b8f3aff28cf06a4d4fd1684ecd84dc821eb..e13e84c2eebf3a41ce235deedaca9ba1cd68b85b 100644 (file)
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -27,6 +27,8 @@
 #include <linux/watchdog.h>
 #include <linux/init.h>
 
+#include <asm/arch/pxa-regs.h>
+
 #include <asm/hardware.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>

diff --git a/include/asm-arm/arch-pxa/serial.h b/include/asm-arm/arch-pxa/serial.h
index 3ef5d802bf66ba544c077ba689070ce48c3c40c9..1d06b3b23891720359e38cfd7531d5459d8fbe31 100644 (file)
--- a/include/asm-arm/arch-pxa/serial.h
+++ b/include/asm-arm/arch-pxa/serial.h
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <asm/arch/pxa-regs.h>
 
 #define BAUD_BASE      921600