[Linux-mips-commits]CVS: linux/include/asm-mips au1000.h,1.21,1.22 bootinfo.h,1.33,1.34 serial.h,1.13,1.14

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

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv1799/include/asm-mips

Modified Files:
	au1000.h bootinfo.h serial.h 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: au1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- au1000.h	25 Sep 2002 07:38:59 -0000	1.21
+++ au1000.h	26 Sep 2002 05:39:40 -0000	1.22
@@ -87,12 +87,12 @@
 }
 
 /* arch/mips/au1000/common/clocks.c */
-extern void set_au1000_speed(unsigned int new_freq);
-extern unsigned int get_au1000_speed(void);
-extern void set_au1000_uart_baud_base(unsigned long new_baud_base);
-extern unsigned long get_au1000_uart_baud_base(void);
-extern void set_au1000_lcd_clock(void);
-extern unsigned int get_au1000_lcd_clock(void);
+extern void set_au1x00_speed(unsigned int new_freq);
+extern unsigned int get_au1x00_speed(void);
+extern void set_au1x00_uart_baud_base(unsigned long new_baud_base);
+extern unsigned long get_au1x00_uart_baud_base(void);
+extern void set_au1x00_lcd_clock(void);
+extern unsigned int get_au1x00_lcd_clock(void);
 
 #ifdef CONFIG_PM
 /* no CP0 timer irq */

Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- bootinfo.h	17 Sep 2002 18:20:01 -0000	1.33
+++ bootinfo.h	26 Sep 2002 05:39:40 -0000	1.34
@@ -10,6 +10,7 @@
 #define _ASM_BOOTINFO_H
 
 #include <linux/types.h>
+#include <asm/mmu.h>
 
 /*
  * Values for machgroup

Index: serial.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/serial.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serial.h	29 Apr 2002 23:05:11 -0000	1.13
+++ serial.h	26 Sep 2002 05:39:40 -0000	1.14
@@ -144,9 +144,9 @@
 #define IVR_SERIAL_PORT_DEFNS
 #endif
 
-#ifdef CONFIG_AU1000_UART
+#ifdef CONFIG_AU1X00_UART
 #include <asm/au1000.h>
-#define AU1000_SERIAL_PORT_DEFNS                              \
+#define AU1X00_SERIAL_PORT_DEFNS                              \
     { baud_base: 0, port: UART0_ADDR, irq: AU1000_UART0_INT,  \
       flags: STD_COM_FLAGS, type: 1 },                        \
     { baud_base: 0, port: UART1_ADDR, irq: AU1000_UART1_INT,  \
@@ -156,7 +156,7 @@
     { baud_base: 0, port: UART3_ADDR, irq: AU1000_UART3_INT,  \
       flags: STD_COM_FLAGS, type: 1 },
 #else
-#define AU1000_SERIAL_PORT_DEFNS
+#define AU1X00_SERIAL_PORT_DEFNS
 #endif
 
 #ifdef CONFIG_CPU_RC32300
@@ -328,7 +328,7 @@
 	EXTRA_SERIAL_PORT_DEFNS		\
 	HUB6_SERIAL_PORT_DFNS		\
 	MOMENCO_OCELOT_SERIAL_PORT_DEFNS\
-	AU1000_SERIAL_PORT_DEFNS	\
+	AU1X00_SERIAL_PORT_DEFNS	\
         TXX927_SERIAL_PORT_DEFNS        \
 	DDB5477_SERIAL_PORT_DEFNS	\
 	VR4122_SERIAL_PORT_DEFNS