patch-2.3.41 linux/drivers/char/Makefile

• Lines: 36
• Date: Wed Jan 26 12:44:21 2000
• Orig file: v2.3.40/linux/drivers/char/Makefile
• Orig date: Fri Jan 21 18:19:16 2000

diff -u --recursive --new-file v2.3.40/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -20,8 +20,8 @@
 
 O_TARGET := char.o
 M_OBJS   :=
-O_OBJS   := tty_io.o n_tty.o tty_ioctl.o mem.o random.o raw.o
-OX_OBJS  := pty.o misc.o
+O_OBJS   := tty_io.o n_tty.o tty_ioctl.o mem.o raw.o
+OX_OBJS  := pty.o misc.o random.o
 
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
@@ -29,8 +29,8 @@
 SERIAL   =serial.o
 
 ifeq ($(ARCH),m68k)
-  KEYMAP   =
   KEYBD    =
+  SERIAL   =
 endif
 
 ifeq ($(ARCH),arm)
@@ -312,6 +312,14 @@
 else
   ifeq ($(CONFIG_ACQUIRE_WDT),m)
   M_OBJS += acquirewdt.o
+  endif
+endif
+
+ifeq ($(CONFIG_MIXCOMWD),y)
+O_OBJS += mixcomwd.o
+else
+  ifeq ($(CONFIG_MIXCOMWD),m)
+  M_OBJS += mixcomwd.o
   endif
 endif