[Linux-mips-commits]CVS: linux/drivers/video Config.in,1.20,1.21 epson1356fb.c,1.10,1.11

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

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

Modified Files:
	Config.in epson1356fb.c 
Log Message:
Split up the Pb board and Au CPU dependencies properly.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Config.in	25 Sep 2002 07:38:59 -0000	1.20
+++ Config.in	26 Sep 2002 05:39:40 -0000	1.21
@@ -154,20 +154,20 @@
 	    bool '    Use Compsite NTSC on Pb1000 (J63)' CONFIG_PB1000_NTSC
 	    bool '    Use TFT Panel on Pb1000 (J64)' CONFIG_PB1000_TFT
 	 fi
-         if [ "$CONFIG_MIPS_PB1500" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
+     if [ "$CONFIG_MIPS_PB1500" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
 	    bool '    Use CRT on Pb1500 ' CONFIG_PB1500_CRT
 	    bool '    Use TFT Panel on Pb1500 ' CONFIG_PB1500_TFT
-         fi
-         if [ "$CONFIG_MIPS_PB1100" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
+     fi
+     if [ "$CONFIG_MIPS_PB1100" = "y" -a "$CONFIG_FB_E1356" != "n" ]; then
 	    bool '    Use CRT on Pb1100 ' CONFIG_PB1500_CRT
 	    bool '    Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
-         fi
-         if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
-	    bool '    Au1100 LCD Driver' CONFIG_FB_AU1100
-         fi
-         if [ "$CONFIG_MIPS_HYD1100" = "y" ]; then
- 	    bool '    Au1100 LCD Driver' CONFIG_FB_AU1100
-         fi
+     fi
+     if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
+	    bool '  Au1100 LCD Driver' CONFIG_FB_AU1100
+     fi
+     if [ "$CONFIG_MIPS_HYD1100" = "y" ]; then
+ 	    bool '  Au1100 LCD Driver' CONFIG_FB_AU1100
+     fi
       fi
       tristate '  ITE IT8181 framebuffer support' CONFIG_FB_IT8181
       tristate '  Simple Frame Buffer support' CONFIG_FB_SIMPLE

Index: epson1356fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- epson1356fb.c	17 Sep 2002 18:20:01 -0000	1.10
+++ epson1356fb.c	26 Sep 2002 05:39:40 -0000	1.11
@@ -77,7 +77,7 @@
 
 #include <linux/e1356fb.h>
 
-#ifdef CONFIG_MIPS_AU1000
+#ifdef CONFIG_CPU_AU1X00
 #include <asm/au1000.h>
 #endif
 
@@ -2323,9 +2323,9 @@
 	 * Program the clocks
 	 */
 
-#ifdef CONFIG_MIPS_AU1000
+#ifdef CONFIG_CPU_AU1X00
 	if ((epfix->system == SYS_PB1000) || (epfix->system == SYS_PB1500))
-		epfix->busclk = get_au1000_lcd_clock();
+		epfix->busclk = get_au1x00_lcd_clock();
 #endif
 	
 	if (epfix->busclk > 80000) {