patch-2.3.99-pre9 linux/drivers/char/Makefile

• Lines: 83
• Date: Sat May 20 12:07:56 2000
• Orig file: v2.3.99-pre8/linux/drivers/char/Makefile
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -136,41 +136,38 @@
 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 obj-$(CONFIG_SX) += sx.o
 
+# If either SX or RIO is in the kernel, generic_serial goes in the
+# kernel, and the module is no longer required. The "in kernel" case
+# is last to be able to override the module case....  This is an
+# example of the new "makefile automatically figures out the
+# dependencies"....  -- REW
 
-# If either is in the kernel, generic_serial goes in the kernel, and
-# the module is no longer required. The "in kernel" case is last to be
-# able to override the module case....  This is an example of the new
-# "makefile automatically figures out the dependencies"....  -- REW
+GS=n
+ifeq ($(CONFIG_RIO),m)
+  M_OBJS += generic_serial.o
+  MOD_SUB_DIRS += rio
+  GS = m
+endif
 
-GS = n
 ifeq ($(CONFIG_SX),m)
   GS = m
+  M_OBJS += sx.o
 endif
-ifeq ($(CONFIG_RIO),m)
-  GS = m 
-endif
-ifeq ($(CONFIG_SX),y)
-  GS = y 
-endif
-ifeq ($(CONFIG_RIO),y)
-  GS = y 
-endif
-obj-$(GS) += generic_serial.o
-
-
-
 
 ifeq ($(CONFIG_RIO),y)
-obj-y += rio/rio.o  generic_serial.o
-SUB_DIRS += rio
-MOD_SUB_DIRS += rio
-else
-  ifeq ($(CONFIG_RIO),m)
-  obj-m += generic_serial.o
+  L_OBJS += rio/rio.o  generic_serial.o
+  SUB_DIRS += rio
   MOD_SUB_DIRS += rio
-  endif
+  GS = y
 endif
 
+ifeq ($(CONFIG_SX),y)
+  L_OBJS += sx.o
+  GS = y
+endif
+
+obj-$(GS) += generic_serial.o
+
 obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
 obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
 obj-$(CONFIG_PRINTER) += lp.o
@@ -205,7 +202,7 @@
 obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
 obj-$(CONFIG_AMIGAMOUSE) += amigamouse.o
 obj-$(CONFIG_ATARIMOUSE) += atarimouse.o
-obj-$(CONFIG_ADBMOUSE) += adbmouse.o busmouse.o
+obj-$(CONFIG_ADBMOUSE) += adbmouse.o
 obj-$(CONFIG_PC110_PAD) += pc110pad.o
 obj-$(CONFIG_WDT) += wdt.o
 obj-$(CONFIG_WDTPCI) += wdt_pci.o
@@ -232,7 +229,8 @@
   endif
 endif
 
-obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tda8425.o tda985x.o tea6300.o
+obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o \
+	tda7432.o tda8425.o tda985x.o tda9875.o tea6300.o tea6420.o
 ifeq ($(CONFIG_VIDEO_BT848),y)
 L_TUNERS=y
 else