patch-2.2.11 linux/drivers/char/Makefile

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

diff -u --recursive --new-file v2.2.10/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -30,16 +30,30 @@
 
 ifeq ($(CONFIG_SERIAL),y)
   ifeq ($(CONFIG_SUN_SERIAL),)
-  LX_OBJS += serial.o
+    ifeq ($(CONFIG_SGI_SERIAL),)
+      ifeq ($(CONFIG_DECSTATION),)
+	ifeq ($(CONFIG_BAGET_MIPS),)
+      LX_OBJS += serial.o
+    endif
+  endif
+    endif
   endif
 else
   ifeq ($(CONFIG_SERIAL),m)
     ifeq ($(CONFIG_SUN_SERIAL),)
-    MX_OBJS += serial.o
+      ifeq ($(CONFIG_SGI_SERIAL),)
+        ifeq ($(CONFIG_DECSTATION),)
+          ifeq ($(CONFIG_BAGET_MIPS),)
+      MX_OBJS += serial.o
+      endif
+    endif
+  endif
     endif
   endif
 endif
 
+ifndef CONFIG_DECSTATION
+ifndef CONFIG_BAGET_MIPS
 ifndef CONFIG_SUN_KEYBOARD
 ifdef CONFIG_VT
 LX_OBJS += keyboard.o
@@ -57,6 +71,8 @@
 ifdef CONFIG_MAGIC_SYSRQ
 LX_OBJS += sysrq.o
 endif
+endif
+endif
 
 ifeq ($(CONFIG_ATARI_DSP56K),y)
 L_OBJS += dsp56k.o
@@ -156,6 +172,14 @@
   endif
 endif
 
+ifeq ($(CONFIG_SX),y)
+L_OBJS += sx.o generic_serial.o
+else
+  ifeq ($(CONFIG_SX),m)
+  M_OBJS += sx.o
+  endif
+endif
+
 ifeq ($(CONFIG_ATIXL_BUSMOUSE),y)
 L_OBJS += atixlmouse.o
 else
@@ -362,6 +386,14 @@
   endif
 endif
 
+ifeq ($(CONFIG_VIDEO_VINO),y)
+L_OBJS += vino.o
+else
+  ifeq ($(CONFIG_VIDEO_VINO),m)
+  M_OBJS += vino.o
+  endif
+endif
+
 ifeq ($(CONFIG_RADIO_AZTECH),y)
 L_OBJS += radio-aztech.o
 else
@@ -477,6 +509,10 @@
   MOD_SUB_DIRS += hfmodem
   endif
 
+endif
+
+ifeq ($(CONFIG_DZ),y)
+  L_OBJS += dz.o
 endif
 
 include $(TOPDIR)/Rules.make

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