diff options
| author | Rik Faith <faith@alephnull.com> | 2000-07-20 01:52:00 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-07-20 01:52:00 +0000 |
| commit | 0bd1fa795a06f592c1115b251685b36fec63fed3 (patch) | |
| tree | e65f04963b2f252d08ba7c0760d314bd08343f88 /linux | |
| parent | e8c9ed03f8d950ef82c09e387001b2fd43b81182 (diff) | |
Fixes for building in the kernel tree
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile.kernel | 9 | ||||
| -rw-r--r-- | linux/drmP.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel index c1812260..bf92d775 100644 --- a/linux/Makefile.kernel +++ b/linux/Makefile.kernel @@ -64,11 +64,11 @@ endif ifeq ($(CONFIG_DRM_R128),y) OX_OBJS += r128_drv.o - O_OBJS += r128_context.o + O_OBJS += r128_context.o r128_bufs.o r128_dma.o else ifeq ($(CONFIG_DRM_I810),m) MIX_OBJS += r128_drv.o - MI_OBJS += r128_context.o + MI_OBJS += r128_context.o r128_bufs.o r128_dma.o M_OBJS += r128.o endif endif @@ -102,8 +102,9 @@ i810.o: i810_drv.o i810_context.o i810_bufs.o i810_dma.o $(L_OBJS) $(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o \ i810_context.o $(L_OBJS) -r128.o: r128_drv.o r128_context.o $(L_OBJS) - $(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_context.o $(L_OBJS) +r128.o: r128_drv.o r128_context.o r128_bufs.o $(L_OBJS) + $(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_bufs.o r128_dma.o \ + r128_context.o $(L_OBJS) ffb.o: ffb_drv.o ffb_context.o $(L_OBJS) $(LD) $(LD_RFLAG) -r -o $@ ffb_drv.o ffb_context.o $(L_OBJS) diff --git a/linux/drmP.h b/linux/drmP.h index 06dc6afa..866aabf6 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -50,7 +50,7 @@ #ifdef CONFIG_MTRR #include <asm/mtrr.h> #endif -#ifdef CONFIG_AGP +#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) #define DRM_AGP #endif #ifdef DRM_AGP |