summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorRik Faith <faith@alephnull.com>2000-07-20 01:14:58 +0000
committerRik Faith <faith@alephnull.com>2000-07-20 01:14:58 +0000
commite8c9ed03f8d950ef82c09e387001b2fd43b81182 (patch)
tree1c9b33bc7eaacedf2293c52ced655908603028ce /linux-core
parent742c33bf6197e6ed18c7de89c7d895fecafaa838 (diff)
Fixed for monolithic kernel build
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/Makefile.kernel4
-rw-r--r--linux-core/drmP.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 9039da81..c1812260 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -98,11 +98,11 @@ mga.o: mga_drv.o mga_context.o mga_dma.o mga_bufs.o mga_state.o $(L_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ mga_drv.o mga_bufs.o mga_dma.o \
mga_context.o mga_state.o $(L_OBJS)
-i810.o: i810_drv.o i810_context.o i810_bufs.o i810_dma.o $(L_TARGET)
+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_TARGET)
+r128.o: r128_drv.o r128_context.o $(L_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_context.o $(L_OBJS)
ffb.o: ffb_drv.o ffb_context.o $(L_OBJS)
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 3362313e..06dc6afa 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -50,6 +50,9 @@
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>
#endif
+#ifdef CONFIG_AGP
+#define DRM_AGP
+#endif
#ifdef DRM_AGP
#include <linux/types.h>
#include <linux/agp_backend.h>