patch-2.3.45 linux/drivers/video/bwtwofb.c

• Lines: 21
• Date: Sun Feb 13 11:21:43 2000
• Orig file: v2.3.44/linux/drivers/video/bwtwofb.c
• Orig date: Fri Jan 28 15:09:08 2000

diff -u --recursive --new-file v2.3.44/linux/drivers/video/bwtwofb.c linux/drivers/video/bwtwofb.c
@@ -25,7 +25,7 @@
 
 #include <video/sbusfb.h>
 #include <asm/io.h>
-#ifndef __sparc_v9__
+#if !defined(__sparc_v9__) && !defined(__mc68000__)
 #include <asm/sun4paddr.h>
 #endif
 
@@ -214,9 +214,11 @@
 				case BWTWO_SR_ID_NOCONN:
 					return NULL;
 				default:
+#ifndef CONFIG_FB_SUN3
 					prom_printf("bw2: can't handle SR %02x\n",
 						    status);
 					prom_halt();
+#endif					
 					return NULL; /* fool gcc. */
 			}
 			for ( ; *p; p += 2) {