commit afd2fc02ab7bae6062671c5ca80dd34c34a63fb7
author Russell King <rmk@dyn-67.arm.linux.org.uk> Thu Aug 07 11:05:25 2008 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu Aug 07 11:06:47 2008 +0100
tree 6048ce3ba252a95ac2195b680caa2b55c384073e
parent 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14
parent 214c6a7ed13e01cab2addeef56124067e4d20147

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

Conflicts:

	arch/arm/mach-pxa/generic.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
	arch/arm/mach-pxa/pxa2xx.c
	arch/arm/mach-pxa/pxa3xx.c
	arch/arm/mach-pxa/reset.c
	arch/arm/mach-pxa/spitz.c
	arch/arm/mach-pxa/tosa.c
	drivers/watchdog/sa1100_wdt.c

arch/arm/mach-pxa/tosa.c

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 38bc59c..5dab30e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -36,6 +36,7 @@
 #include <asm/mach-types.h>
 #include <mach/pxa2xx-regs.h>
 #include <mach/mfp-pxa25x.h>
+#include <mach/reset.h>
 #include <mach/irda.h>
 #include <mach/i2c.h>
 #include <mach/mmc.h>