in the hope of gareth telling me 'wtf???' is ? (if I couldn't guess!)

This commit is contained in:
Alan Hourihane 2001-02-09 16:48:50 +00:00
parent 0d43651ac5
commit b381e69d45
3 changed files with 4 additions and 7 deletions

View file

@ -837,7 +837,6 @@ extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
#endif
#if __HAVE_DMA_FREELIST
#error "wtf???"
extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
extern int DRM(freelist_destroy)(drm_freelist_t *bl);
extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,

View file

@ -60,8 +60,8 @@ DRMTEMPLATES= drm_init.h drm_memory.h drm_proc.h drm_auth.h drm_context.h \
drm_fops.h drm_vm.h drm_dma.h drm_stub.h
DRMHEADERS= drm.h drmP.h compat-pre24.h
GAMMAOBJS= gamma_drv.o gamma_dma.o
GAMMAHEADERS= gamma_drv.h $(DRMHEADERS)
GAMMAOBJS= gamma_drv.o gamma_drm.o gamma_dma.o
GAMMAHEADERS= gamma_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
TDFXOBJS= tdfx_drv.o tdfx_context.o
TDFXHEADERS= tdfx_drv.h $(DRMHEADERS)
@ -136,12 +136,11 @@ endif
ifeq ($(AGP),1)
MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
#DRMOBJS += agpsupport.o
MODS += mga.o
MODS += mga.o gamma.o
#ifeq ($(MACHINE),i386)
#MODS += i810.o
#endif
MGAOBJS= mga_drv.o mga_drm.o mga_dma.o mga_state.o mga_warp.o
MGAHEADERS= mga_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
@ -212,7 +211,7 @@ dristat: dristat.c
gamma_drv.o: gamma_drv.c
$(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
gamma.o: $(GAMMAOBJS) $(LIBS)
gamma.o: $(GAMMAOBJS)
$(LD) -r $^ -o $@
tdfx_drv.o: tdfx_drv.c

View file

@ -837,7 +837,6 @@ extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
#endif
#if __HAVE_DMA_FREELIST
#error "wtf???"
extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
extern int DRM(freelist_destroy)(drm_freelist_t *bl);
extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,