Re: [2.6 patch] fix fallout from the pxa-regs.h #define move

[Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx>]

On Sat, Jul 19, 2008 at 07:46:28PM +0300, Adrian Bunk wrote:
> This patch fixes various compile errors caused by
> commit 0b0a9df6038752674e54e333cd247c877d29aab8
> ([ARM] pxa: separate out power manager and clock registers).
> 
> Reported-by: Adrian Bunk <bunk@xxxxxxxxxx>
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx>
> 
> ---
> 
>  arch/arm/mach-pxa/spitz.c        |    1 +
>  drivers/input/keyboard/tosakbd.c |    1 +
>  drivers/watchdog/sa1100_wdt.c    |    1 +
>  3 files changed, 3 insertions(+)
> 
> dc190ab56c309472885b0c0aa6de16efa12bf945 
> diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
> index 34a2b3b..40b724d 100644
> --- a/drivers/watchdog/sa1100_wdt.c
> +++ b/drivers/watchdog/sa1100_wdt.c
> @@ -29,6 +29,7 @@
>  
>  #ifdef CONFIG_ARCH_PXA
>  #include <asm/arch/pxa-regs.h>
> +#include <asm/arch/pxa2xx-regs.h>
>  #endif
>  
>  #include <asm/hardware.h>
> 2817475c30a4a91d1a3c6f4bb37dfd3718b7b801 
> diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c
> index 94e444b..008ed26 100644
> --- a/drivers/input/keyboard/tosakbd.c
> +++ b/drivers/input/keyboard/tosakbd.c
> @@ -21,6 +21,7 @@
>  
>  #include <asm/arch/gpio.h>
>  #include <asm/arch/tosa.h>
> +#include <asm/arch/pxa2xx-regs.h>
>  
>  #define KB_ROWMASK(r)		(1 << (r))
>  #define SCANCODE(r, c)		(((r)<<4) + (c) + 1)
> b19892c348aa89ed48085eaf2ff69bab93112fb8 
> diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
> index e7d0fcd..5ce19d4 100644
> --- a/arch/arm/mach-pxa/spitz.c
> +++ b/arch/arm/mach-pxa/spitz.c
> @@ -46,6 +46,7 @@
>  #include <asm/arch/akita.h>
>  #include <asm/arch/spitz.h>
>  #include <asm/arch/sharpsl.h>
> +#include <asm/arch/pxa27x-udc.h>
>  
>  #include <asm/mach/sharpsl_param.h>
>  #include <asm/hardware/scoop.h>
> 

Fix is already included in my git repository, which is waiting for the
SPI tree to be merged first.  Please wait until the end of the merge
window before fixing anything.  Thanks.

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php