diff options
| author | Rik Faith <faith@alephnull.com> | 2000-01-06 12:55:00 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-01-06 12:55:00 +0000 |
| commit | 1c33c6909546e3b51f36c04bba12cc2275149902 (patch) | |
| tree | d9f78be33af43f6bca16bf367ee9a01441487a40 /linux-core | |
| parent | 0371c290a12f75d36c9c1e7c947bf98fe210908b (diff) | |
Import of XFree86 3.9.17
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Makefile.kernel | 8 | ||||
| -rw-r--r-- | linux-core/drmP.h | 2 | ||||
| -rw-r--r-- | linux-core/tdfx_drv.c | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 57c6c50c..c286d8fd 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -9,6 +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.2 1999/09/27 14:59:24 dawes Exp $ L_TARGET := libdrm.a @@ -21,14 +22,7 @@ ifdef CONFIG_DRM_GAMMA M_OBJS += gamma.o endif -ifdef CONFIG_DRM_TDFX -M_OBJS += tdfx.o -endif - include $(TOPDIR)/Rules.make gamma.o: gamma_drv.o gamma_dma.o $(L_TARGET) $(LD) $(LD_RFLAG) -r -o $@ gamma_drv.o gamma_dma.o -L. -ldrm - -tdfx.o: tdfx_drv.o tdfx_context.o $(L_TARGET) - $(LD) $(LD_RFLAG) -r -o $@ tdfx_drv.o tdfx_context.o -L. -ldrm diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 966e6e05..e01cf28b 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.2 1999/12/14 01:33:56 robin Exp $ * */ diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index da1a3540..31924254 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI$ - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.1 1999/12/14 01:49:22 robin Exp $ * */ |