From 16e387a0a8f9188449a79ab9c1251f3e42e6ae33 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 21 Jun 2007 14:36:22 -0700
Subject: [PATCH] Missed some conflicts on previous commit.

---
 linux-core/Makefile | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/linux-core/Makefile b/linux-core/Makefile
index 946bfff4..d2ed5c0c 100644
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -89,11 +89,7 @@ SAVAGEHEADERS=  savage_drv.h savage_drm.h $(DRMHEADERS)
 VIAHEADERS =	via_drm.h via_drv.h via_3d_reg.h via_verifier.h $(DRMHEADERS)
 MACH64HEADERS = mach64_drv.h mach64_drm.h $(DRMHEADERS)
 NVHEADERS =     nv_drv.h $(DRMHEADERS)
-<<<<<<< HEAD:linux-core/Makefile
-NVSHARED  =     nv_drv.h
-XGIHEADERS =    xgi_drv.h xgi_drm.h
-=======
->>>>>>> 40f6a696cb22ffa064f78198a7a241015d365967:linux-core/Makefile
+XGIHEADERS =    xgi_drv.h xgi_drm.h $(DRMHEADERS)
 FFBHEADERS = 	ffb_drv.h $(DRMHEADERS)
 NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS)
 
@@ -288,11 +284,8 @@ CONFIG_DRM_SAVAGE := n
 CONFIG_DRM_VIA := n
 CONFIG_DRM_MACH64 := n
 CONFIG_DRM_NV := n
-<<<<<<< HEAD:linux-core/Makefile
-CONFIG_DRM_XGI := n
-=======
 CONFIG_DRM_NOUVEAU := n
->>>>>>> 40f6a696cb22ffa064f78198a7a241015d365967:linux-core/Makefile
+CONFIG_DRM_XGI := n
 
 # Enable module builds for the modules requested/supported.
 
@@ -326,13 +319,11 @@ endif
 ifneq (,$(findstring nv,$(DRM_MODULES)))
 CONFIG_DRM_NV := m
 endif
-<<<<<<< HEAD:linux-core/Makefile
-ifneq (,$(findstring xgi,$(DRM_MODULES)))
-CONFIG_DRM_XGI := m
-=======
 ifneq (,$(findstring nouveau,$(DRM_MODULES)))
 CONFIG_DRM_NOUVEAU := m
->>>>>>> 40f6a696cb22ffa064f78198a7a241015d365967:linux-core/Makefile
+endif
+ifneq (,$(findstring xgi,$(DRM_MODULES)))
+CONFIG_DRM_XGI := m
 endif
 
 # These require AGP support
@@ -360,11 +351,8 @@ $(savage-objs): $(SAVAGEHEADERS)
 $(via-objs):	$(VIAHEADERS)
 $(mach64-objs): $(MACH64HEADERS)
 $(nv-objs):     $(NVHEADERS)
-<<<<<<< HEAD:linux-core/Makefile
-$(xgi-objs):    $(XGIHEADERS)
-=======
 $(nouveau-objs): $(NOUVEAUHEADERS)
->>>>>>> 40f6a696cb22ffa064f78198a7a241015d365967:linux-core/Makefile
+$(xgi-objs):    $(XGIHEADERS)
 
 endif