Merge branch 'master' into for-next

1 files changed, 0 insertions, 6 deletions

diff --git a/arch/mips/alchemy/devboards/pb1200/board_setup.c b/arch/mips/alchemy/devboards/pb1200/board_setup.c
index 3184063f8042..8b4466f2d44a 100644
--- a/arch/mips/alchemy/devboards/pb1200/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1200/board_setup.c
@@ -48,12 +48,6 @@ const char *get_system_type(void)
         return "Alchemy Pb1200";
 }
 
-void board_reset(void)
-{
-        bcsr_write(BCSR_RESETS, 0);
-        bcsr_write(BCSR_SYSTEM, 0);
-}
-
 void __init board_setup(void)
 {
         printk(KERN_INFO "AMD Alchemy Pb1200 Board\n");