From 6dd96a15ed329f26565bb971877f03e15801f3f5 Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Fri, 21 Jul 2000 16:57:00 +0000 Subject: Revert some changes and try alternative way to clean up AGP handling. --- linux-core/Makefile.kernel | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'linux-core/Makefile.kernel') diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index b19f77c6..b756c950 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -13,12 +13,11 @@ O_TARGET := drm.o 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 + lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o M_OBJS := -ifdef CONFIG_DRM_AGP +ifneq ($(CONFIG_AGP),n) L_OBJS += agpsupport.o endif @@ -44,6 +43,7 @@ else endif endif +ifneq ($(CONFIG_AGP),n) ifeq ($(CONFIG_DRM_MGA),y) OX_OBJS += mga_drv.o O_OBJS += mga_context.o mga_dma.o mga_bufs.o mga_state.o @@ -54,7 +54,9 @@ else M_OBJS += mga.o endif endif +endif +ifneq ($(CONFIG_AGP),n) ifeq ($(CONFIG_DRM_I810),y) OX_OBJS += i810_drv.o O_OBJS += i810_context.o i810_bufs.o i810_dma.o @@ -65,6 +67,7 @@ else M_OBJS += i810.o endif endif +endif ifeq ($(CONFIG_DRM_R128),y) OX_OBJS += r128_drv.o -- cgit v1.2.3