From e15a24e154d6749ba0be3155ed802005c5e1ebf0 Mon Sep 17 00:00:00 2001 From: Gareth Hughes Date: Sat, 2 Dec 2000 06:14:18 +0000 Subject: Merged ati-4-1-1-branch into trunk. --- linux/Makefile.linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/Makefile.linux') diff --git a/linux/Makefile.linux b/linux/Makefile.linux index adf19005..2d8abbb5 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -11,11 +11,11 @@ # the rights to use, copy, modify, merge, publish, distribute, sublicense, # and/or sell copies of the Software, and to permit persons to whom the # Software is furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice (including the next # paragraph) shall be included in all copies or substantial portions of the # Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -60,7 +60,7 @@ GAMMAHEADERS= gamma_drv.h $(DRMHEADERS) TDFXOBJS= tdfx_drv.o tdfx_context.o TDFXHEADERS= tdfx_drv.h $(DRMHEADERS) -R128OBJS= r128_drv.o r128_dma.o r128_bufs.o r128_context.o +R128OBJS= r128_drv.o r128_cce.o r128_bufs.o r128_state.o r128_context.o R128HEADERS= r128_drv.h r128_drm.h $(DRMHEADERS) INC= /usr/include -- cgit v1.2.3