patch-2.1.79 linux/drivers/macintosh/Makefile

Next file: linux/drivers/macintosh/adb.c
Previous file: linux/drivers/fc4/soc.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.78/linux/drivers/macintosh/Makefile linux/drivers/macintosh/Makefile
@@ -14,12 +14,12 @@
 
 L_TARGET := macintosh.a
 M_OBJS   :=
-L_OBJS   := via-cuda.o adb.o nvram.o
+L_OBJS   := via-cuda.o adb.o nvram.o macio-adb.o
 
-ifeq ($(CONFIG_SERIAL),y)
+ifeq ($(CONFIG_SERIAL)$(CONFIG_PMAC),yy)
   LX_OBJS += macserial.o
 else
-  ifeq ($(CONFIG_SERIAL),m)
+  ifeq ($(CONFIG_SERIAL)$(CONFIG_PMAC),my)
     MX_OBJS += macserial.o
   endif
 endif
@@ -30,7 +30,19 @@
 
 ifdef CONFIG_VT
   ifdef CONFIG_PMAC_CONSOLE
-    L_OBJS += pmac-cons.o control.o platinum.o valkyrie.o
+    L_OBJS += pmac-cons.o
+    ifdef CONFIG_CONTROL_VIDEO
+      L_OBJS += control.o
+    endif
+    ifdef CONFIG_PLATINUM_VIDEO
+      L_OBJS += platinum.o
+    endif
+    ifdef CONFIG_VALKYRIE_VIDEO
+      L_OBJS += valkyrie.o
+    endif
+    ifdef CONFIG_CHIPS_VIDEO
+      L_OBJS += chips.o
+    endif
     ifdef CONFIG_ATY_VIDEO
       L_OBJS += aty.o
     endif

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