diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 15:28:24 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 15:28:24 +0400 |
| commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
| tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /arch/arm/mach-pxa/pxa2xx.c | |
| parent | 7225e75144b9718cbbe1820d9c011c809d5773fd (diff) | |
| parent | 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff) | |
| download | linux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz | |
Merge branch 'linus' into x86/doc
Diffstat (limited to 'arch/arm/mach-pxa/pxa2xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa2xx.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c index d4f6415e8413..73d04d81c75a 100644 --- a/arch/arm/mach-pxa/pxa2xx.c +++ b/arch/arm/mach-pxa/pxa2xx.c @@ -14,9 +14,18 @@ #include <linux/kernel.h> #include <linux/device.h> -#include <asm/arch/mfp-pxa2xx.h> -#include <asm/arch/mfp-pxa25x.h> -#include <asm/arch/irda.h> +#include <mach/hardware.h> +#include <mach/pxa2xx-regs.h> +#include <mach/mfp-pxa2xx.h> +#include <mach/mfp-pxa25x.h> +#include <mach/reset.h> +#include <mach/irda.h> + +void pxa2xx_clear_reset_status(unsigned int mask) +{ + /* RESET_STATUS_* has a 1:1 mapping with RCSR */ + RCSR = mask; +} static unsigned long pxa2xx_mfp_fir[] = { GPIO46_FICP_RXD, |