patch-2.2.14 linux/drivers/char/Makefile

• Lines: 85
• Date: Tue Jan 4 10:12:14 2000
• Orig file: v2.2.13/linux/drivers/char/Makefile
• Orig date: Tue Jan 4 11:10:33 2000

diff -u --recursive --new-file v2.2.13/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -59,8 +59,10 @@
 LX_OBJS += keyboard.o
 endif
  ifneq ($(ARCH),m68k)
+  ifneq ($(ARCH),s390)
    L_OBJS += pc_keyb.o defkeymap.o
  endif
+ endif
 else
 ifdef CONFIG_PCI
 L_OBJS += defkeymap.o
@@ -92,6 +94,22 @@
   endif
 endif
 
+ifeq ($(CONFIG_MOXA_SMARTIO),y)
+L_OBJS += mxser.o
+else
+  ifeq ($(CONFIG_MOXA_SMARTIO),m)
+  M_OBJS += mxser.o
+  endif
+endif
+
+ifeq ($(CONFIG_MOXA_INTELLIO),y)
+L_OBJS += moxa.o
+else
+  ifeq ($(CONFIG_MOXA_INTELLIO),m)
+  M_OBJS += moxa.o
+  endif
+endif
+
 ifeq ($(CONFIG_DIGI),y)
 L_OBJS += pcxx.o
 else
@@ -270,6 +288,14 @@
   endif
 endif
 
+ifeq ($(CONFIG_MIXCOMWD),y)
+L_OBJS += mixcomwd.o
+else
+  ifeq ($(CONFIG_MIXCOMWD),m)
+  M_OBJS += mixcomwd.o
+  endif
+endif
+
 ifeq ($(CONFIG_AMIGAMOUSE),y)
 L_OBJS += amigamouse.o
 else
@@ -343,11 +369,21 @@
 endif
 
 ifeq ($(CONFIG_VIDEO_BT848),y)
-L_OBJS += bttv.o msp3400.o tuner.o
+L_OBJS += bttv.o tuner.o
 L_I2C=y
 else
   ifeq ($(CONFIG_VIDEO_BT848),m)
-    M_OBJS += bttv.o msp3400.o tuner.o
+    M_OBJS += bttv.o tuner.o
+    M_I2C=y
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_MSP3400),y)
+L_OBJS += msp3400.o 
+L_I2C=y
+else
+  ifeq ($(CONFIG_VIDEO_MSP3400),m)
+    M_OBJS += msp3400.o
     M_I2C=y
   endif
 endif
@@ -380,9 +416,11 @@
 
 ifeq ($(CONFIG_VIDEO_ZORAN),y)
 L_OBJS += buz.o
+L_I2C=y
 else
   ifeq ($(CONFIG_VIDEO_ZORAN),m)
     M_OBJS += buz.o
+    M_I2C=y
   endif
 endif