patch-2.1.67 linux/drivers/char/Makefile

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

diff -u --recursive --new-file v2.1.66/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -273,11 +273,47 @@
 
 ifeq ($(CONFIG_NVRAM),y)
 M = y
-L_OBJS += nvram.o
+  ifeq ($(CONFIG_PMAC)$(CONFIG_CHRP),)
+  L_OBJS += nvram.o
+  endif
 else
   ifeq ($(CONFIG_NVRAM),m)
     MM = m
+    ifeq ($(CONFIG_PMAC)$(CONFIG_CHRP),)
     M_OBJS += nvram.o
+    endif
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_DEV),y)
+LX_OBJS += videodev.o
+else
+  ifeq ($(CONFIG_VIDEO_DEV),m)
+    MX_OBJS += videodev.o
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_BT848),y)
+L_OBJS += bttv.o
+else
+  ifeq ($(CONFIG_VIDEO_BT848),m)
+    M_OBJS += bttv.o
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_BWQCAM),y)
+L_OBJS += bw-qcam.o
+else
+  ifeq ($(CONFIG_VIDEO_BWQCAM),m)
+    M_OBJS += bw-qcam.o
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_PMS),y)
+L_OBJS += pms.o
+else
+  ifeq ($(CONFIG_VIDEO_PMS),m)
+    M_OBJS += pms.o
   endif
 endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov