diff options
| author | Dave Airlie <airlied@optimus.localdomain> | 2006-12-20 10:30:16 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-12-20 10:30:16 +1100 |
| commit | e5c4a26a29a9af301cb8b0aebbba84e70f995b83 (patch) | |
| tree | 3eba66ce42ce7c3d2d9ced2d726b9ca5d553843a /linux-core/Makefile | |
| parent | 3b7508d1bf2c78f19d882beffa6d8b4f58bd19a8 (diff) | |
| parent | dc1b68aacbfc8d53d78f7388e0e52da1747a1f71 (diff) | |
Merge branch 'nouveau-1'
Diffstat (limited to 'linux-core/Makefile')
| -rw-r--r-- | linux-core/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index 06a15ff2..590633b3 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))) @@ -91,6 +91,7 @@ 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) FFBHEADERS = ffb_drv.h $(DRMHEADERS) +NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS) PROGS = dristat drmstat @@ -314,6 +315,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 @@ -344,6 +348,7 @@ $(savage-objs): $(SAVAGEHEADERS) $(via-objs): $(VIAHEADERS) $(mach64-objs): $(MACH64HEADERS) $(nv-objs): $(NVHEADERS) +$(nouveau-objs): $(NOUVEAUHEADERS) endif |