summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
commitb2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch)
tree954a648692e7da983db1d2470953705f6a729264 /drivers/video/sis
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/video/sis')
-rw-r--r--drivers/video/sis/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/sis/Makefile b/drivers/video/sis/Makefile
index 2e657f107..9a4a23417 100644
--- a/drivers/video/sis/Makefile
+++ b/drivers/video/sis/Makefile
@@ -3,9 +3,9 @@
#
O_TARGET := sisfb.o
-O_OBJS := sis_main.o sis_300.o sis_301.o
-#O_OBJS := sis_300.o
-M_OBJS := $(O_TARGET)
+
+obj-y := sis_main.o sis_300.o sis_301.o
+obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make