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/plat-omap/include/plat/system.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/plat-omap/include/plat/system.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/system.h b/arch/arm/plat-omap/include/plat/system.h index c5fa9e929009..8e5ebd74b129 100644 --- a/arch/arm/plat-omap/include/plat/system.h +++ b/arch/arm/plat-omap/include/plat/system.h @@ -12,6 +12,4 @@ static inline void arch_idle(void) cpu_do_idle(); } -extern void (*arch_reset)(char, const char *); - #endif |