Commit d14378fa authored by Ian Campbell's avatar Ian Campbell Committed by Russell King

[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 
parent 46b043ef
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
.text .text
/* /*
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/arch/pxa-regs.h>
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <asm/arch/pxa-regs.h>
#define BAUD_BASE 921600 #define BAUD_BASE 921600
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment