diff options
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/clocksource.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/gpio.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/clocksource.c b/arch/arm/mach-pxa/clocksource.c index c941f154d4..5a890acb3c 100644 --- a/arch/arm/mach-pxa/clocksource.c +++ b/arch/arm/mach-pxa/clocksource.c @@ -22,7 +22,7 @@ #define OSCR 0x40A00010 -uint64_t pxa_clocksource_read(void) +static uint64_t pxa_clocksource_read(void) { return readl(OSCR); } diff --git a/arch/arm/mach-pxa/common.c b/arch/arm/mach-pxa/common.c index c0281d69ef..f2648f4687 100644 --- a/arch/arm/mach-pxa/common.c +++ b/arch/arm/mach-pxa/common.c @@ -29,8 +29,6 @@ #define OWER_WME (1 << 0) /* Watch-dog Match Enable */ #define OSSR_M3 (1 << 3) /* Match status channel 3 */ -extern void pxa_clear_reset_source(void); - static void __noreturn pxa_restart_soc(struct restart_handler *rst) { /* Clear last reset source */ diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c index 7dd6ac0648..ebda6bbe2a 100644 --- a/arch/arm/mach-pxa/gpio.c +++ b/arch/arm/mach-pxa/gpio.c @@ -12,6 +12,7 @@ #include <common.h> #include <errno.h> +#include <gpio.h> #include <mach/gpio.h> #include <asm/io.h> diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 902d11ddfc..d968a11880 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h @@ -46,6 +46,10 @@ #ifdef __ASSEMBLY__ #define __REG(x) (x) +#else + +void pxa_clear_reset_source(void); + #endif #endif /* !__MACH_HARDWARE_H */ |