Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv1198/drivers/video
Modified Files:
offb.c
Log Message:
Synced to 2.4.12
Index: offb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/offb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- offb.c 2001/08/03 16:08:35 1.12
+++ offb.c 2001/10/15 01:13:17 1.13
@@ -31,9 +31,9 @@
#endif
#include <asm/io.h>
#include <asm/prom.h>
+#ifdef CONFIG_BOOTX_TEXT
#include <asm/bootx.h>
-
-// #include <video/macmodes.h>
+#endif
/* Supported palette hacks */
enum {
@@ -69,7 +69,9 @@
/*
* Interface to the low level console driver
*/
+#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,
@@ -109,6 +111,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;
@@ -171,7 +174,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])))
offb_init_nodriver(dp);
@@ -288,7 +291,8 @@
unsigned long regbase = dp->addrs[2].address;
par->cmap_adr = ioremap(regbase, 0x1FFF);
par->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;
par->cmap_adr = ioremap(regbase, 0x1FFF);
par->cmap_type = cmap_M3A;
|
