diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-09-06 15:37:52 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-09-06 15:37:52 -0700 |
| commit | 54c96cbc46a21e05cf991d0e4a26da58bd87ce85 (patch) | |
| tree | 19bd9c681b3a07bebdb17964c392c28940367045 /linux-core/Makefile | |
| parent | edf5a86a269690b0e42a5cee7d4ac3828b42ca3e (diff) | |
| parent | c597bd57eee3ea05a3b8c851615c7351d0b32fce (diff) | |
Merge branch 'xgi-0-0-2'
Diffstat (limited to 'linux-core/Makefile')
| -rw-r--r-- | linux-core/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index 1758777c..55e25253 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 nouveau.o + mach64.o nv.o nouveau.o xgi.o # Modules only for ix86 architectures ifneq (,$(findstring 86,$(MACHINE))) @@ -91,6 +91,7 @@ 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) +XGIHEADERS = xgi_cmdlist.h xgi_drv.h xgi_misc.h xgi_regs.h $(DRMHEADERS) PROGS = dristat drmstat @@ -284,6 +285,7 @@ CONFIG_DRM_VIA := n CONFIG_DRM_MACH64 := n CONFIG_DRM_NV := n CONFIG_DRM_NOUVEAU := n +CONFIG_DRM_XGI := n # Enable module builds for the modules requested/supported. @@ -320,6 +322,9 @@ endif ifneq (,$(findstring nouveau,$(DRM_MODULES))) CONFIG_DRM_NOUVEAU := m endif +ifneq (,$(findstring xgi,$(DRM_MODULES))) +CONFIG_DRM_XGI := m +endif # These require AGP support @@ -347,6 +352,7 @@ $(via-objs): $(VIAHEADERS) $(mach64-objs): $(MACH64HEADERS) $(nv-objs): $(NVHEADERS) $(nouveau-objs): $(NOUVEAUHEADERS) +$(xgi-objs): $(XGIHEADERS) endif |