[PATCH] compiling rivafb and other fbs

From: Bakonyi Ferenc (fero@drama.obuda.kando.hu)
Date: Tue Jun 13 2000 - 10:01:25 EST


        Hi!

This patch against 2.4.0test1-ac17 fixes the following problems:
-if compiling rivafb as a module fbcon-cfb{8,16,32}.o doesn't
compiled automagically
-if you try compiling rivafb _not_ as a module it will compile as a
module!
-a small typo (a missing space) prevents using fbcon-cfb16 from most
of framebuffers

Greetings:
        Ferenc Bakonyi

diff -u --recursive linux-2.4.0test1-ac17/drivers/video/Config.in linux.ac/drivers/video/Config.in
--- linux-2.4.0test1-ac17/drivers/video/Config.in Tue Jun 13 13:42:57 2000
+++ linux.ac/drivers/video/Config.in Tue Jun 13 14:40:26 2000
@@ -236,6 +236,7 @@
               "$CONFIG_FB_IGA" = "m" -o "$CONFIG_FB_MATROX" = "m" -o \
               "$CONFIG_FB_CT65550" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
               "$CONFIG_FB_P9100" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
+ "$CONFIG_FB_RIVA" = "m" -o \
               "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_CYBER2000" = "m" -o \
               "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
             define_tristate CONFIG_FBCON_CFB8 m
@@ -258,14 +259,15 @@
          if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
               "$CONFIG_FB_MAC" = "m" -o "$CONFIG_FB_VESA" = "m" -o \
               "$CONFIG_FB_VIRTUAL" = "m" -o "$CONFIG_FB_TBOX" = "m" -o \
- "$CONFIG_FB_Q40" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
+ "$CONFIG_FB_Q40" = "m" -o \
               "$CONFIG_FB_CONTROL" = "m" -o "$CONFIG_FB_CLGEN" = "m" -o \
               "$CONFIG_FB_VIRGE" = "m" -o "$CONFIG_FB_CYBER" = "m" -o \
               "$CONFIG_FB_VALKYRIE" = "m" -o "$CONFIG_FB_PLATINUM" = "m" -o \
               "$CONFIG_FB_CT65550" = "m" -o "$CONFIG_FB_MATROX" = "m" -o \
               "$CONFIG_FB_PM2" = "m" -o "$CONFIG_FB_SGIVW" = "m" -o \
+ "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
               "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
- "$CONFIG_FB_SA1100" = "m"]; then
+ "$CONFIG_FB_SA1100" = "m" ]; then
             define_tristate CONFIG_FBCON_CFB16 m
          fi
       fi
@@ -299,8 +301,8 @@
               "$CONFIG_FB_CONTROL" = "m" -o "$CONFIG_FB_CLGEN" = "m" -o \
               "$CONFIG_FB_TGA" = "m" -o "$CONFIG_FB_PLATINUM" = "m" -o \
               "$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
- "$CONFIG_FB_ATY128" = "m" -o \
- "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
+ "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
+ "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
             define_tristate CONFIG_FBCON_CFB32 m
          fi
       fi
diff -u --recursive linux-2.4.0test1-ac17/drivers/video/Makefile linux.ac/drivers/video/Makefile
--- linux-2.4.0test1-ac17/drivers/video/Makefile Thu May 25 03:38:26 2000
+++ linux.ac/drivers/video/Makefile Tue Jun 13 13:50:33 2000
@@ -103,7 +103,6 @@
 ifeq ($(CONFIG_FB_RIVA),y)
 SUB_DIRS += riva
 obj-y += riva/rivafb.o
-MOD_SUB_DIRS += riva
 else
   ifeq ($(CONFIG_FB_RIVA),m)
   MOD_SUB_DIRS += riva

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jun 15 2000 - 21:00:31 EST