Fixes for building in the kernel tree

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 2937898..b19f77c 100644 (file)
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -16,7 +16,11 @@ L_OBJS               := init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
                        lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o \
                        agpsupport.o
 
-M_OBJS         := 
+M_OBJS         :=
+
+ifdef CONFIG_DRM_AGP
+ L_OBJS         += agpsupport.o
+endif
 
 ifeq ($(CONFIG_DRM_GAMMA),y)
  OX_OBJS += gamma_drv.o

diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index 2937898..b19f77c 100644 (file)
--- a/linux/Makefile.kernel
+++ b/linux/Makefile.kernel
@@ -16,7 +16,11 @@ L_OBJS               := init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
                        lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o \
                        agpsupport.o
 
-M_OBJS         := 
+M_OBJS         :=
+
+ifdef CONFIG_DRM_AGP
+ L_OBJS         += agpsupport.o
+endif
 
 ifeq ($(CONFIG_DRM_GAMMA),y)
  OX_OBJS += gamma_drv.o