diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-20 13:11:02 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-20 13:11:02 +0800 |
| commit | fe4cc50983bdaf51bf29ef041f65e0007f547844 (patch) | |
| tree | f92f233efb08d7fcae8181553ecda8def4ad2e31 /linux-core/Makefile | |
| parent | 8398b99d8d146278adc13d6093811e53cd42c88a (diff) | |
| parent | 209870a88262a4a27b36e5cc97f3b1e7021dbefd (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core/Makefile')
| -rw-r--r-- | linux-core/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index 590633b3..bca8210d 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -63,7 +63,7 @@ MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \ # Modules only for ix86 architectures ifneq (,$(findstring 86,$(MACHINE))) ARCHX86 := 1 -MODULE_LIST += i830.o i810.o i915.o +MODULE_LIST += i810.o i915.o endif ifneq (,$(findstring sparc64,$(MACHINE))) @@ -83,7 +83,6 @@ R128HEADERS = r128_drv.h r128_drm.h $(DRMHEADERS) RADEONHEADERS = radeon_drv.h radeon_drm.h r300_reg.h $(DRMHEADERS) MGAHEADERS = mga_drv.h mga_drm.h mga_ucode.h $(DRMHEADERS) I810HEADERS = i810_drv.h i810_drm.h $(DRMHEADERS) -I830HEADERS = i830_drv.h i830_drm.h $(DRMHEADERS) I915HEADERS = i915_drv.h i915_drm.h $(DRMHEADERS) SISHEADERS= sis_drv.h sis_drm.h drm_hashtab.h drm_sman.h $(DRMHEADERS) SAVAGEHEADERS= savage_drv.h savage_drm.h $(DRMHEADERS) @@ -274,7 +273,6 @@ CONFIG_DRM_MGA := n CONFIG_DRM_I810 := n CONFIG_DRM_R128 := n CONFIG_DRM_RADEON := n -CONFIG_DRM_I830 := n CONFIG_DRM_I915 := n CONFIG_DRM_SIS := n CONFIG_DRM_FFB := n @@ -324,9 +322,6 @@ endif ifneq (,$(findstring i810,$(DRM_MODULES))) CONFIG_DRM_I810 := m endif -ifneq (,$(findstring i830,$(DRM_MODULES))) -CONFIG_DRM_I830 := m -endif ifneq (,$(findstring i915,$(DRM_MODULES))) CONFIG_DRM_I915 := m endif @@ -339,7 +334,6 @@ $(tdfx-objs): $(TDFXHEADERS) $(r128-objs): $(R128HEADERS) $(mga-objs): $(MGAHEADERS) $(i810-objs): $(I810HEADERS) -$(i830-objs): $(I830HEADERS) $(i915-objs): $(I915HEADERS) $(radeon-objs): $(RADEONHEADERS) $(sis-objs): $(SISHEADERS) |