patch-2.2.11 linux/drivers/video/Makefile

• Lines: 55
• Date: Mon Aug 9 12:04:40 1999
• Orig file: v2.2.10/linux/drivers/video/Makefile
• Orig date: Tue May 11 16:30:36 1999

diff -u --recursive --new-file v2.2.10/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -192,9 +192,11 @@
 
 ifeq ($(CONFIG_FB_TGA),y)
 L_OBJS += tgafb.o
+CONFIG_FBGEN_BUILTIN = y
 else
   ifeq ($(CONFIG_FB_TGA),m)
   M_OBJS += tgafb.o
+  CONFIG_FBGEN_MODULE = y
   endif
 endif
 
@@ -202,6 +204,10 @@
 L_OBJS += vesafb.o
 endif
 
+ifeq ($(CONFIG_FB_VGA16),y)
+L_OBJS += vga16fb.o
+endif
+
 ifeq ($(CONFIG_FB_VIRGE),y)
 L_OBJS += virgefb.o
 else
@@ -462,6 +468,14 @@
   endif
 endif
 
+ifeq ($(CONFIG_FBCON_VGA_PLANES),y)
+OX_OBJS += fbcon-vga-planes.o
+else
+  ifeq ($(CONFIG_FBCON_VGA_PLANES),m)
+  MX_OBJS += fbcon-vga-planes.o
+  endif
+endif
+
 ifeq ($(CONFIG_FBCON_VGA),y)
 OX_OBJS += fbcon-vga.o
 else
@@ -483,6 +497,16 @@
 else
   ifeq ($(CONFIG_MDA_CONSOLE),m)
   M_OBJS += mdacon.o
+  endif
+endif
+
+# Newport Text Console
+
+ifeq ($(CONFIG_SGI_NEWPORT_CONSOLE),y)
+L_OBJS += newport_con.o vga_font.o
+else
+  ifeq ($(CONFIG_SGI_NEWPORT_CONSOLE),m)
+  M_OBJS += newport_con.o vga_font.o
   endif
 endif