patch-2.4.0-test11 linux/drivers/video/Makefile

• Lines: 25
• Date: Wed Nov 8 17:15:04 2000
• Orig file: v2.4.0-test10/linux/drivers/video/Makefile
• Orig date: Sun Oct 8 10:50:31 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -89,7 +89,6 @@
 obj-$(CONFIG_FB_CGFOURTEEN)       += cgfourteenfb.o sbusfb.o
 obj-$(CONFIG_FB_P9100)            += p9100fb.o sbusfb.o
 obj-$(CONFIG_FB_LEO)              += leofb.o sbusfb.o
-obj-$(CONFIG_FB_SIS)              += sisfb.o
 
 ifeq ($(CONFIG_FB_MATROX),y)
 SUB_DIRS			  += matrox
@@ -109,6 +108,16 @@
   MOD_SUB_DIRS			  += riva
   endif
 endif
+
+ifeq ($(CONFIG_FB_SIS),y)
+SUB_DIRS			  += sis
+obj-y				  += sis/sisfb.o
+else
+  ifeq ($(CONFIG_FB_SIS),m)
+  MOD_SUB_DIRS			  += sis
+  endif
+endif
+
 
 obj-$(CONFIG_FB_SUN3)             += sun3fb.o
 obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o