diff --git a/[refs] b/[refs] index 870690912125..b833841ed2f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe76daea9ede24f9f53cb847563c2fa7a50cedf2 +refs/heads/master: d9eedaf329a28a20a4b0f18fed2beb40be10a406 diff --git a/trunk/arch/arm/plat-samsung/include/plat/reset.h b/trunk/arch/arm/plat-samsung/include/plat/reset.h deleted file mode 100644 index 32ca5179c6e1..000000000000 --- a/trunk/arch/arm/plat-samsung/include/plat/reset.h +++ /dev/null @@ -1,16 +0,0 @@ -/* linux/arch/arm/plat-samsung/include/plat/reset.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __PLAT_SAMSUNG_RESET_H -#define __PLAT_SAMSUNG_RESET_H __FILE__ - -extern void (*s5p_reset_hook)(void); - -#endif /* __PLAT_SAMSUNG_RESET_H */ diff --git a/trunk/arch/arm/plat-samsung/include/plat/system-reset.h b/trunk/arch/arm/plat-samsung/include/plat/system-reset.h index a448e990964d..73d7808a26f1 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/system-reset.h +++ b/trunk/arch/arm/plat-samsung/include/plat/system-reset.h @@ -14,18 +14,7 @@ #include -void (*s5p_reset_hook)(void); - static void arch_reset(char mode, const char *cmd) { - /* SWRESET support in s5p_reset_hook() */ - - if (s5p_reset_hook) - s5p_reset_hook(); - - /* Perform reset using Watchdog reset - * if there is no s5p_reset_hook() - */ - arch_wdt_reset(); }