patch-2.1.110 linux/drivers/video/Makefile

• Lines: 65
• Date: Sat Jul 18 13:55:45 1998
• Orig file: v2.1.109/linux/drivers/video/Makefile
• Orig date: Thu Jul 16 18:09:27 1998

diff -u --recursive --new-file v2.1.109/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -29,9 +29,14 @@
   L_OBJS += dummycon.o
 endif
 
+ifeq ($(CONFIG_PROM_CONSOLE),y)
+  L_OBJS += promcon.o
+endif
+
 ifeq ($(CONFIG_FB),y)
-  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o font_sun8x16.o
-  OX_OBJS += fbcon.o fbcmap.o fbgen.o
+  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o font_sun8x16.o font_sun12x22.o
+  OX_OBJS += fbcon.o fbcmap.o
+# fbgen is not compiled by default since nobody uses it yet
 endif
 
 # Frame Buffer Devices
@@ -60,6 +65,10 @@
 L_OBJS += atyfb.o
 endif
 
+ifeq ($(CONFIG_FB_CT65550),y)
+L_OBJS += chipsfb.o
+endif
+
 ifeq ($(CONFIG_FB_CYBER),y)
 L_OBJS += cyberfb.o
 else
@@ -77,7 +86,7 @@
 endif
 
 ifeq ($(CONFIG_FB_OF),y)
-L_OBJS += offb.o
+L_OBJS += offb.o macmodes.o
 endif
 
 ifeq ($(CONFIG_FB_RETINAZ3),y)
@@ -132,14 +141,6 @@
   endif
 endif
 
-ifeq ($(CONFIG_FB_PROM),y)
-L_OBJS += promfb.o
-else
-  ifeq ($(CONFIG_FB_PROM),m)
-  M_OBJS += promfb.o
-  endif
-endif
-
 ifeq ($(CONFIG_FB_SBUS),y)
 L_OBJS += sbusfb.o
   ifeq ($(CONFIG_FB_CREATOR),y)
@@ -316,12 +317,6 @@
 
 ifdef CONFIG_VGA_CONSOLE
 L_OBJS += vgacon.o
-endif
-
-# Console Wrapper
-
-ifdef CONFIG_ABSCON_COMPAT
-L_OBJS += compatcon.o
 endif
 
 include $(TOPDIR)/Rules.make