summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/system.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-07 20:53:13 +0000
committerArnd Bergmann <arnd@arndb.de>2012-01-07 20:53:13 +0000
commit23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch)
tree60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/plat-omap/include/plat/system.h
parente195ffbe4573f79d590e63e2ae32dac2a73d5768 (diff)
parent7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff)
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.h2
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 c5fa9e92900..8e5ebd74b12 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