patch-2.3.50 linux/drivers/char/Makefile

• Lines: 45
• Date: Mon Mar 6 15:32:30 2000
• Orig file: v2.3.49/linux/drivers/char/Makefile
• Orig date: Thu Mar 2 14:36:22 2000

diff -u --recursive --new-file v2.3.49/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -38,7 +38,7 @@
 
 export-objs     :=	busmouse.o console.o i2c-old.o keyboard.o sysrq.o \
 			misc.o pty.o random.o selection.o serial.o videodev.o \
-			tty_io.o
+			tty_io.o bttv.o
 
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
@@ -61,6 +61,20 @@
   SERIAL   =
 endif
 
+ifeq ($(ARCH),sh)
+  KEYMAP   =
+  KEYBD    =
+  CONSOLE  =
+  SERIAL =
+  ifeq ($(CONFIG_SERIAL),y)
+  SERIAL = generic_serial.o sh-sci.o
+  else
+    ifeq ($(CONFIG_SERIAL),m)
+    SERIAL = sh-sci.o
+    endif
+  endif
+endif
+
 ifeq ($(CONFIG_DECSTATION),y)
   KEYBD    =
   SERIAL   =
@@ -180,13 +194,11 @@
   endif
 endif
 
-obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tda8425.o tda9855.o tea6300.o
+obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tda8425.o tda985x.o tea6300.o
 ifeq ($(CONFIG_VIDEO_BT848),y)
-L_I2C=y
 L_TUNERS=y
 else
   ifeq ($(CONFIG_VIDEO_BT848),m)
-    L_I2C=m
     L_TUNERS=m
   endif
 endif