aboutsummaryrefslogtreecommitdiff
path: root/linux-core/Makefile
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-08-27 08:55:02 +1000
committerDave Airlie <airlied@linux.ie>2006-08-27 08:55:02 +1000
commitfef9b30a2b437c0103c33443566604027529b91d (patch)
tree7ca0494cd59e6fd96e8a16d456ad2970da53ebc3 /linux-core/Makefile
parent0afb877a37a33e8493628ddc267fb00650fd1840 (diff)
initial import of nouveau code from nouveau CVS
Diffstat (limited to 'linux-core/Makefile')
-rw-r--r--linux-core/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile
index 32828d28..e3432b5c 100644
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -58,7 +58,7 @@ endif
# Modules for all architectures
MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \
- mach64.o nv.o
+ mach64.o nv.o nouveau.o
# Modules only for ix86 architectures
ifneq (,$(findstring 86,$(MACHINE)))
@@ -106,10 +106,12 @@ MACH64SHARED = mach64_drv.h mach64_drm.h mach64_dma.c \
NVHEADERS = nv_drv.h $(DRMHEADERS)
NVSHARED = nv_drv.h
FFBHEADERS = ffb_drv.h $(DRMHEADERS)
+NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS)
+NOUVEAUSHARED = nouveau_drv.h nouveau_drm.h nouveau_reg.h nouveau_state.c nouveau_fifo.c nouveau_mem.c nouveau_object.c nouveau_irq.c
SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
$(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
- $(I915SHARED) $(SAVAGESHARED) $(NVSHARED)
+ $(I915SHARED) $(SAVAGESHARED) $(NVSHARED) $(NOUVEAUSHARED)
PROGS = dristat drmstat
@@ -372,6 +374,9 @@ endif
ifneq (,$(findstring nv,$(DRM_MODULES)))
CONFIG_DRM_NV := m
endif
+ifneq (,$(findstring nouveau,$(DRM_MODULES)))
+CONFIG_DRM_NOUVEAU := m
+endif
# These require AGP support
@@ -402,6 +407,7 @@ $(savage-objs): $(SAVAGEHEADERS)
$(via-objs): $(VIAHEADERS)
$(mach64-objs): $(MACH64HEADERS)
$(nv-objs): $(NVHEADERS)
+$(nouveau-objs): $(NOUVEAUHEADERS)
endif