patch-2.1.124 linux/drivers/char/Makefile

• Lines: 22
• Date: Sun Oct 4 10:22:43 1998
• Orig file: v2.1.123/linux/drivers/char/Makefile
• Orig date: Mon Sep 28 10:51:33 1998

diff -u --recursive --new-file v2.1.123/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -27,17 +27,16 @@
 L_OBJS += vt.o vc_screen.o consolemap.o consolemap_deftbl.o
 LX_OBJS += console.o selection.o
 endif
-ifdef CONFIG_FB
-  LX_OBJS += fbmem.o
-endif
 
 ifeq ($(CONFIG_SERIAL),y)
-  ifndef CONFIG_SUN_SERIAL
+  ifeq ($(CONFIG_SUN_SERIAL),)
   LX_OBJS += serial.o
   endif
 else
   ifeq ($(CONFIG_SERIAL),m)
-  MX_OBJS += serial.o
+    ifeq ($(CONFIG_SUN_SERIAL),)
+    MX_OBJS += serial.o
+    endif
   endif
 endif