kbuild: Use standard multi-part object declaration in drivers/video/*

5 files changed, 20 insertions, 37 deletions

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 1158bc96c6c2..c1bfd07409e6 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -88,26 +88,10 @@ obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
 obj-$(CONFIG_FB_TX3912)           += tx3912fb.o
 
-
-subdir-$(CONFIG_FB_MATROX)	  += matrox
-ifeq ($(CONFIG_FB_MATROX),y)
-obj-y				  += matrox/matrox.o
-endif
-
-subdir-$(CONFIG_FB_RIVA)	  += riva
-ifeq ($(CONFIG_FB_RIVA),y)
-obj-y				  += riva/rivafb.o
-endif
-
-subdir-$(CONFIG_FB_SIS)		  += sis
-ifeq ($(CONFIG_FB_SIS),y)
-obj-y				  += sis/sisfb.o
-endif
-
-subdir-$(CONFIG_FB_ATY)		  += aty
-ifeq ($(CONFIG_FB_ATY),y)
-obj-y				  += aty/atyfb.o
-endif
+obj-$(CONFIG_FB_MATROX)		  += matrox/
+obj-$(CONFIG_FB_RIVA)		  += riva/
+obj-$(CONFIG_FB_SIS)		  += sis/
+obj-$(CONFIG_FB_ATY)		  += aty/
 
 obj-$(CONFIG_FB_SUN3)             += sun3fb.o
 obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o
diff --git a/drivers/video/aty/Makefile b/drivers/video/aty/Makefile
index 147df38f1478..1e0a77490852 100644
--- a/drivers/video/aty/Makefile
+++ b/drivers/video/aty/Makefile
@@ -1,12 +1,14 @@
 
-O_TARGET := atyfb.o
+O_TARGET := built-in.o
 
 export-objs    :=  atyfb_base.o mach64_accel.o
 
-obj-y				:= atyfb_base.o mach64_accel.o
-obj-$(CONFIG_FB_ATY_GX)		+= mach64_gx.o
-obj-$(CONFIG_FB_ATY_CT)		+= mach64_ct.o mach64_cursor.o
-obj-m				:= $(O_TARGET)
+obj-$(CONFIG_FB_ATY) += atyfb.o
+
+atyfb-y				:= atyfb_base.o mach64_accel.o
+atyfb-$(CONFIG_FB_ATY_GX)	+= mach64_gx.o
+atyfb-$(CONFIG_FB_ATY_CT)	+= mach64_ct.o mach64_cursor.o
+atyfb-objs			:= $(atyfb-y)
 
 include $(TOPDIR)/Rules.make
 
diff --git a/drivers/video/matrox/Makefile b/drivers/video/matrox/Makefile
index b34afde318de..f5c32a18661e 100644
--- a/drivers/video/matrox/Makefile
+++ b/drivers/video/matrox/Makefile
@@ -2,7 +2,7 @@
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com>
 # Rewritten to use lists instead of if-statements.
 
-O_TARGET := matrox.o
+O_TARGET := built-in.o
 
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
diff --git a/drivers/video/riva/Makefile b/drivers/video/riva/Makefile
index a80e814cc3f5..2588483afbb3 100644
--- a/drivers/video/riva/Makefile
+++ b/drivers/video/riva/Makefile
@@ -1,15 +1,11 @@
 #
 # Makefile for the Riva framebuffer driver
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
-O_TARGET := rivafb.o
+O_TARGET := built-in.o
+
+obj-$(CONFIG_FB_RIVA) += rivafb.o
 
-obj-y    := fbdev.o riva_hw.o accel.o
-obj-m    := $(O_TARGET)
+rivafb-objs := fbdev.o riva_hw.o accel.o
 
 include $(TOPDIR)/Rules.make
diff --git a/drivers/video/sis/Makefile b/drivers/video/sis/Makefile
index dec70b81b78b..dcd444d47271 100644
--- a/drivers/video/sis/Makefile
+++ b/drivers/video/sis/Makefile
@@ -2,12 +2,13 @@
 # Makefile for the SiS framebuffer device driver
 #
 
-O_TARGET := sisfb.o
+O_TARGET := built-in.o
 
 export-objs := sis_main.o
 
-obj-y  := sis_main.o init.o init301.o
-obj-m  := $(O_TARGET)
+obj-$(CONFIG_FB_SIS) += sisfb.o
+
+sisfb-objs := sis_main.o init.o init301.o
 
 include $(TOPDIR)/Rules.make