From 4791dc885619b1a6460c1fcf48f648945feea4d3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sat, 18 Feb 2006 02:53:36 +0000
Subject: major realigment of DRM CVS with kernel code, makes integration much
 easier

---
 linux-core/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'linux-core/Makefile')

diff --git a/linux-core/Makefile b/linux-core/Makefile
index ab3609ba..9bb578cd 100644
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -44,10 +44,17 @@ LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \
 endif
 
 ifndef O
-O := $(LINUXDIR)
+O := $(shell if [ -e /lib/modules/$(RUNNING_REL)/build ]; then \
+		 echo /lib/modules/$(RUNNING_REL)/build; \
+		 else echo ""; fi)
+#O := $(LINUXDIR)
 endif
 
+ifdef ARCH
+MACHINE := $(ARCH)
+else
 MACHINE := $(shell uname -m)
+endif
 
 # Modules for all architectures
 MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \
@@ -61,7 +68,7 @@ endif
 
 ifneq (,$(findstring sparc64,$(MACHINE)))
 ARCHSPARC64 := 1
-MODULE_LIST += ffb.o
+#MODULE_LIST += ffb.o
 endif
 
 DRM_MODULES ?= $(MODULE_LIST)
@@ -370,7 +377,6 @@ endif
 
 # These require AGP support
 
-ifdef CONFIG_AGP
 ifneq (,$(findstring i810,$(DRM_MODULES)))
 CONFIG_DRM_I810 := m
 endif
@@ -380,7 +386,6 @@ endif
 ifneq (,$(findstring i915,$(DRM_MODULES)))
 CONFIG_DRM_I915 := m
 endif
-endif
 
 include $(DRMSRCDIR)/Makefile.kernel
 
-- 
cgit v1.2.3