diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
| commit | 3d3a96ad4e5596187236898ca241515a21661b69 (patch) | |
| tree | 89b2b0900cf02235741fa670e7947babc8959ebe /linux-core/Makefile | |
| parent | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (diff) | |
| parent | e349b58b4a6ebfe299720cb921039a600c145e65 (diff) | |
Merge branch 'origin' into bo-set-pin
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 46c821a4..1cdf3b30 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 @@ -285,6 +286,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. @@ -321,6 +323,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 @@ -348,6 +353,7 @@ $(via-objs): $(VIAHEADERS) $(mach64-objs): $(MACH64HEADERS) $(nv-objs): $(NVHEADERS) $(nouveau-objs): $(NOUVEAUHEADERS) +$(xgi-objs): $(XGIHEADERS) endif |