[Linux-mips-commits]CVS: linux/arch/mips/au1000/common power.c,1.6,1.7

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv25995/arch/mips/au1000/common

Modified Files:
	power.c 
Log Message:
Moved au1k_wait() to kernel/setup.c to fix the compile problem.


Index: power.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/power.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- power.c	22 Apr 2002 17:45:00 -0000	1.6
+++ power.c	23 Apr 2002 16:43:47 -0000	1.7
@@ -49,7 +49,7 @@
 #  define DPRINTK(fmt, args...)
 #endif
 
-inline void au1k_wait(void);
+extern void au1k_wait(void);
 static void calibrate_delay(void);
 
 extern void set_au1000_speed(unsigned int new_freq);
@@ -278,13 +278,6 @@
 
 __initcall(pm_init);
 
-inline void au1k_wait(void)
-{
-	__asm__(".set\tmips3\n\t"
-		"wait\n\t"
-		"nop\n\t" "nop\n\t" "nop\n\t" "nop\n\t" ".set\tmips0");
-}
-
 
 /*
  * This is right out of init/main.c
@@ -330,12 +323,8 @@
 	}
 }
 
-
-#else				/* CONFIG_PM */
-
 void au1k_wait(void)
 {
 	__asm__("nop\n\t" "nop\n\t");
 }
-
 #endif				/* CONFIG_PM */