patch-2.2.15 linux/drivers/char/Makefile

• Lines: 52
• Date: Fri Apr 21 12:46:04 2000
• Orig file: v2.2.14/drivers/char/Makefile
• Orig date: Tue Jan 4 21:18:45 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/char/Makefile linux/drivers/char/Makefile
@@ -11,7 +11,7 @@
 
 SUB_DIRS     := 
 MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS) ftape joystick
+ALL_SUB_DIRS := $(SUB_DIRS) rio ftape joystick
 
 #
 # This file contains the font map for the default (hardware) font
@@ -202,7 +202,18 @@
 L_OBJS += sx.o generic_serial.o
 else
   ifeq ($(CONFIG_SX),m)
-  M_OBJS += sx.o
+  M_OBJS += sx.o  generic_serial.o
+  endif
+endif
+
+ifeq ($(CONFIG_RIO),y)
+L_OBJS += rio/rio.o  generic_serial.o
+SUB_DIRS += rio
+MOD_SUB_DIRS += rio
+else
+  ifeq ($(CONFIG_RIO),m)
+  M_OBJS += generic_serial.o
+  MOD_SUB_DIRS += rio
   endif
 endif
 
@@ -461,6 +472,22 @@
 else
   ifeq ($(CONFIG_VIDEO_VINO),m)
   M_OBJS += vino.o
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_CPIA),y)
+LX_OBJS += cpia.o
+else
+  ifeq ($(CONFIG_VIDEO_CPIA),m)
+    MX_OBJS += cpia.o
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_CPIA_PP),y)
+L_OBJS += cpia_pp.o
+else
+  ifeq ($(CONFIG_VIDEO_CPIA_PP),m)
+    M_OBJS += cpia_pp.o
   endif
 endif