aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/tosa.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-07 06:05:25 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-07 06:06:47 -0400
commitafd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch)
tree6048ce3ba252a95ac2195b680caa2b55c384073e /arch/arm/mach-pxa/tosa.c
parent1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 (diff)
parent214c6a7ed13e01cab2addeef56124067e4d20147 (diff)
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
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
-rw-r--r--arch/arm/mach-pxa/tosa.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 38bc59c44110..5dab30eafddc 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -36,6 +36,7 @@
36#include <asm/mach-types.h> 36#include <asm/mach-types.h>
37#include <mach/pxa2xx-regs.h> 37#include <mach/pxa2xx-regs.h>
38#include <mach/mfp-pxa25x.h> 38#include <mach/mfp-pxa25x.h>
39#include <mach/reset.h>
39#include <mach/irda.h> 40#include <mach/irda.h>
40#include <mach/i2c.h> 41#include <mach/i2c.h>
41#include <mach/mmc.h> 42#include <mach/mmc.h>