patch-2.1.107 linux/drivers/video/Makefile

Next file: linux/drivers/video/S3triofb.c
Previous file: linux/drivers/video/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.106/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -64,6 +64,10 @@
 L_OBJS += macfb.o
 endif
 
+ifeq ($(CONFIG_FB_HP300),y)
+L_OBJS += hpfb.o
+endif
+
 ifeq ($(CONFIG_FB_OF),y)
 L_OBJS += offb.o
 endif
@@ -88,6 +92,22 @@
 L_OBJS += tgafb.o
 endif
 
+ifeq ($(CONFIG_FB_VGA),y)
+L_OBJS += vgafb.o
+endif
+
+ifeq ($(CONFIG_FB_VESA),y)
+L_OBJS += vesafb.o
+endif
+
+ifeq ($(CONFIG_FB_MDA),y)
+L_OBJS += mdafb.o
+else
+  ifeq ($(CONFIG_FB_MDA),m)
+  M_OBJS += mdafb.o
+  endif
+endif
+
 ifeq ($(CONFIG_FB_VIRGE),y)
 L_OBJS += virgefb.o
 else
@@ -158,6 +178,10 @@
 LX_OBJS += fbcon-mfb.o
 endif
 
+ifdef CONFIG_FBCON_VGA
+LX_OBJS += fbcon-vga.o
+endif
+
 # GSP Console
 
 ifdef CONFIG_AMIGA_GSP
@@ -166,10 +190,16 @@
 
 # VGA Text Console
 
-ifdef CONFIG_ABSTRACT_CONSOLE
 ifdef CONFIG_VGA_CONSOLE
+ifndef CONFIG_FB_VGA
 L_OBJS := $(L_OBJS) vgacon.o
 endif
+endif
+
+# Console Wrapper
+
+ifdef CONFIG_ABSCON_COMPAT
+L_OBJS := $(L_OBJS) compatcon.o
 endif
 
 include $(TOPDIR)/Rules.make

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov