diff options
| author | Arnd Bergmann | 2012-01-07 21:53:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-01-07 21:53:13 +0100 |
| commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
| tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/mach-omap2/common.h | |
| parent | Merge branch 'tegra/soc' into next/soc (diff) | |
| parent | Merge branch 'restart' into for-linus (diff) | |
| download | kernel-qcow2-linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.gz kernel-qcow2-linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.xz kernel-qcow2-linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.zip | |
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/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 4b2b416fafe1..9403b2ce6c85 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -92,6 +92,7 @@ void omap3_init_early(void); /* Do not use this one */ void am35xx_init_early(void); void ti81xx_init_early(void); void omap4430_init_early(void); +void omap_prcm_restart(char, const char *); /* * IO bases for various OMAP processors |