summaryrefslogtreecommitdiff
path: root/linux-core/Makefile.kernel
diff options
context:
space:
mode:
authorDaryll Strauss <daryll@users.sourceforge.net>2000-07-11 19:37:14 +0000
committerDaryll Strauss <daryll@users.sourceforge.net>2000-07-11 19:37:14 +0000
commit3fdcc554e29fc62e2bc987e044607326324f768f (patch)
tree586d32b944f1e244d13f8dce73617f5c12535b3d /linux-core/Makefile.kernel
parentdc2701a9f6034a04319f71e43e7f928f818be6db (diff)
Merge the trunk onto the tdfx-2-1 branch. Now up to date with 4.0.1.tdfx-2-1-20000711
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r--linux-core/Makefile.kernel2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index a169473a..e262213a 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -9,7 +9,7 @@
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.5 2000/02/14 06:27:25 martin Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.6 2000/06/17 00:03:34 martin Exp $
L_TARGET := libdrm.a