diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 12:05:25 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 12:06:47 +0200 |
| commit | afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch) | |
| tree | 6048ce3ba252a95ac2195b680caa2b55c384073e /arch/arm/mach-pxa/tosa.c | |
| parent | [ARM] 5185/1: Fix spi num_chipselect for lubbock (diff) | |
| parent | [ARM] sa1100_wdt: use reset_status to remember watchdog reset status (diff) | |
| download | linux-afd2fc02ab7bae6062671c5ca80dd34c34a63fb7.tar.xz linux-afd2fc02ab7bae6062671c5ca80dd34c34a63fb7.zip | |
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.c | 1 |
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 @@ #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> |