[Linux-mips-commits]CVS: linux/arch/mips/au1000/common Makefile,1.8,1.9 power.c,1.5,1.6

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

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

Modified Files:
	Makefile power.c 
Log Message:
Fixed up the Pb1x00 power management.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	15 Feb 2002 19:47:24 -0000	1.8
+++ Makefile	22 Apr 2002 17:45:00 -0000	1.9
@@ -19,9 +19,9 @@
 
 O_TARGET := au1000.o
 
-export-objs		= prom.o serial.o clocks.o
+export-objs		= prom.o serial.o clocks.o power.o
 
-obj-y := prom.o int-handler.o dma.o irq.o puts.o time.o reset.o power.o clocks.o
+obj-y := prom.o int-handler.o dma.o irq.o puts.o time.o reset.o clocks.o power.o
 
 obj-$(CONFIG_AU1000_UART) += serial.o             
 obj-$(CONFIG_AU1000_USB_DEVICE) += usbdev.o

Index: power.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/power.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- power.c	15 Feb 2002 19:47:24 -0000	1.5
+++ power.c	22 Apr 2002 17:45:00 -0000	1.6
@@ -49,7 +49,7 @@
 #  define DPRINTK(fmt, args...)
 #endif
 
-inline void au1_wait(void);
+inline void au1k_wait(void);
 static void calibrate_delay(void);
 
 extern void set_au1000_speed(unsigned int new_freq);
@@ -138,7 +138,7 @@
 		if (retval)
 			return retval;
 		suspend_mode = 1;
-		au1_wait();
+		au1k_wait();
 		retval = pm_send_all(PM_RESUME, (void *) 0);
 	}
 	return retval;
@@ -278,7 +278,7 @@
 
 __initcall(pm_init);
 
-inline void au1_wait(void)
+inline void au1k_wait(void)
 {
 	__asm__(".set\tmips3\n\t"
 		"wait\n\t"
@@ -333,7 +333,7 @@
 
 #else				/* CONFIG_PM */
 
-void au1_wait(void)
+void au1k_wait(void)
 {
 	__asm__("nop\n\t" "nop\n\t");
 }