patch-2.3.16 linux/drivers/char/Makefile

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

diff -u --recursive --new-file v2.3.15/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -206,11 +206,11 @@
   endif
 endif
 
-ifeq ($(CONFIG_MOUSE),y)
+ifeq ($(CONFIG_BUSMOUSE),y)
 M = y
 OX_OBJS += busmouse.o
 else
-  ifeq ($(CONFIG_MOUSE),m)
+  ifeq ($(CONFIG_BUSMOUSE),m)
   MM = m
   MX_OBJS += busmouse.o
   endif
@@ -224,6 +224,22 @@
   endif
 endif
 
+ifeq ($(CONFIG_R3964),y)
+O_OBJS += n_r3964.o
+else
+  ifeq ($(CONFIG_R3964),m)
+  M_OBJS += n_r3964.o
+  endif
+endif
+
+ifeq ($(CONFIG_APPLICOM),y)
+O_OBJS += applicom.o
+else
+  ifeq ($(CONFIG_APPLICOM),m)
+  M_OBJS += applicom.o
+  endif
+endif
+
 ifeq ($(CONFIG_MS_BUSMOUSE),y)
 O_OBJS += msbusmouse.o
 else
@@ -385,7 +401,7 @@
 ifeq ($(CONFIG_VIDEO_ZORAN),y)
 O_OBJS += buz.o
 else
-  ifeq ($(CONFIG_VIDEO_LML33),m)
+  ifeq ($(CONFIG_VIDEO_ZORAN),m)
     M_OBJS += buz.o
   endif
 endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)