From: Nicolas Pitre <nico@cam.org>

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/arm/mach-pxa/pxa27x.c     |    2 +-
 25-akpm/drivers/usb/host/ohci-pxa27x.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/arm/mach-pxa/pxa27x.c~fix-pxa270-compile-errors-missing-include arch/arm/mach-pxa/pxa27x.c
--- 25/arch/arm/mach-pxa/pxa27x.c~fix-pxa270-compile-errors-missing-include	2004-10-21 20:56:37.228322032 -0700
+++ 25-akpm/arch/arm/mach-pxa/pxa27x.c	2004-10-21 20:56:37.234321120 -0700
@@ -14,13 +14,13 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <asm/arch/pxa-regs.h>
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/device.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/arch/pxa-regs.h>
 
 #include "generic.h"
 
diff -puN drivers/usb/host/ohci-pxa27x.c~fix-pxa270-compile-errors-missing-include drivers/usb/host/ohci-pxa27x.c
--- 25/drivers/usb/host/ohci-pxa27x.c~fix-pxa270-compile-errors-missing-include	2004-10-21 20:56:37.230321728 -0700
+++ 25-akpm/drivers/usb/host/ohci-pxa27x.c	2004-10-21 20:56:37.234321120 -0700
@@ -22,6 +22,7 @@
 #include <linux/device.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
+#include <asm/arch/pxa-regs.h>
 
 
 #define PMM_NPS_MODE           1
_