This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / au1000 / pb1100 / board_setup.c

diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c
index e57c364..abe5f47 100644 (file)
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -37,8 +37,8 @@
 #include <asm/mipsregs.h>
 #include <asm/reboot.h>
 #include <asm/pgtable.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-pb1x00/pb1100.h>
+#include <asm/au1000.h>
+#include <asm/pb1100.h>
 
 #ifdef CONFIG_USB_OHCI
 // Enable the workaround for the OHCI DoneHead
@@ -48,12 +48,6 @@
     !!! I shall not define symbols starting with CONFIG_ !!!
 #endif
 
-void board_reset (void)
-{
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-    au_writel(0x00000000, 0xAE00001C);
-}
-
 void __init board_setup(void)
 {
        u32 pin_func;