Merge with Linux 2.1.67.

1 files changed, 49 insertions, 3 deletions

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index e0cb4dd44..58ca9aa09 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -279,11 +279,54 @@ endif
 
 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
+
+ifeq ($(CONFIG_MISC_RADIO),y)
+L_OBJS += radio.o
+  ifeq ($(CONFIG_RADIO_RTRACK),y)
+  L_OBJS += rtrack.o
   endif
 endif
 
@@ -296,8 +339,11 @@ else
 endif
 
 ifeq ($(CONFIG_FTAPE),y)
-SUB_DIRS += ftape
-L_OBJS += ftape/ftape.o
+L_OBJS       += ftape/ftape.o
+SUB_DIRS     += ftape
+ifneq ($(CONFIG_ZFTAPE),n)
+MOD_SUB_DIRS += ftape
+endif
 else
   ifeq ($(CONFIG_FTAPE),m)
   MOD_SUB_DIRS += ftape