diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-omap2/common.h | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 012bac7d56a5..cda888a2e635 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
| @@ -84,6 +84,7 @@ void omap3_init_early(void); /* Do not use this one */ | |||
| 84 | void am35xx_init_early(void); | 84 | void am35xx_init_early(void); |
| 85 | void ti816x_init_early(void); | 85 | void ti816x_init_early(void); |
| 86 | void omap4430_init_early(void); | 86 | void omap4430_init_early(void); |
| 87 | void omap_prcm_restart(char, const char *); | ||
| 87 | 88 | ||
| 88 | /* | 89 | /* |
| 89 | * IO bases for various OMAP processors | 90 | * IO bases for various OMAP processors |