patch-2.4.11-dontuse linux/drivers/video/offb.c

• Lines: 47
• Date: Tue Oct 2 09:10:31 2001
• Orig file: v2.4.10/linux/drivers/video/offb.c
• Orig date: Sun Sep 23 11:41:00 2001

diff -u --recursive --new-file v2.4.10/linux/drivers/video/offb.c linux/drivers/video/offb.c
@@ -32,7 +32,9 @@
 #endif
 #include <asm/io.h>
 #include <asm/prom.h>
+#ifdef CONFIG_BOOTX_TEXT
 #include <asm/bootx.h>
+#endif
 
 #include <video/fbcon.h>
 #include <video/fbcon-cfb8.h>
@@ -95,8 +97,9 @@
 			struct fb_info *info);
 static int offb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-
+#ifdef CONFIG_BOOTX_TEXT
 extern boot_infos_t *boot_infos;
+#endif
 
 static void offb_init_nodriver(struct device_node *);
 static void offb_init_fb(const char *name, const char *full_name, int width,
@@ -253,6 +256,7 @@
 {
     struct device_node *dp;
     unsigned int dpy;
+#ifdef CONFIG_BOOTX_TEXT
     struct device_node *displays = find_type_devices("display");
     struct device_node *macos_display = NULL;
 
@@ -315,6 +319,7 @@
 		     boot_infos->dispDeviceDepth,
 		     boot_infos->dispDeviceRowBytes, addr, NULL);
     }
+#endif
 
     for (dpy = 0; dpy < prom_num_displays; dpy++) {
 	if ((dp = find_path_device(prom_display_paths[dpy])))
@@ -426,7 +431,8 @@
 		unsigned long regbase = dp->addrs[2].address;
 		info->cmap_adr = ioremap(regbase, 0x1FFF);
 		info->cmap_type = cmap_r128;
-	} else if (dp && !strncmp(name, "ATY,RageM3pA", 12)) {
+	} else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
+		|| !strncmp(name, "ATY,RageM3p12A", 14))) {
 		unsigned long regbase = dp->parent->addrs[2].address;
 		info->cmap_adr = ioremap(regbase, 0x1FFF);
 		info->cmap_type = cmap_M3A;