geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the AGP requirement from Makefile and Kconfig for MGA. Remove the 

AGP requirement from Kconfig for SIS. There never was a requirement in
    Makefile, and Eric Anholt confirms that the Makefile was correct.
main
Ian Romanick 2005-06-29 23:20:30 +00:00
parent eeaeefca54
commit 1b4ce02506
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-core/Kconfig
View File

@ -74,19 +74,17 @@ endchoice
config DRM_MGA config DRM_MGA
tristate "Matrox g200/g400" tristate "Matrox g200/g400"
depends on DRM && AGP && (!X86_64 || BROKEN) depends on DRM && (!X86_64 || BROKEN) && (!PPC || BROKEN)
help help
Choose this option if you have a Matrox G200, G400 or G450 graphics Choose this option if you have a Matrox G200, G400, G450 or G550
card. If M is selected, the module will be called mga. AGP graphics card. If M is selected, the module will be called mga.
support is required for this driver to work.
config DRM_SIS config DRM_SIS
tristate "SiS video cards" tristate "SiS video cards"
depends on DRM && AGP depends on DRM
help help
Choose this option if you have a SiS 630 or compatible video Choose this option if you have a SiS 630 or compatible video
chipset. If M is selected the module will be called sis. AGP chipset. If M is selected the module will be called sis.
support is required for this driver to work.
config DRM_VIA config DRM_VIA
tristate "Via unichrome video cards" tristate "Via unichrome video cards"

6
linux-core/Makefile
View File

@ -357,13 +357,13 @@ endif
ifneq (,$(findstring savage,$(DRM_MODULES))) ifneq (,$(findstring savage,$(DRM_MODULES)))
CONFIG_DRM_SAVAGE := m CONFIG_DRM_SAVAGE := m
endif endif
ifneq (,$(findstring mga,$(DRM_MODULES)))
CONFIG_DRM_MGA := m
endif
# These require AGP support # These require AGP support
ifdef CONFIG_AGP ifdef CONFIG_AGP
ifneq (,$(findstring mga,$(DRM_MODULES)))
CONFIG_DRM_MGA := m
endif
ifneq (,$(findstring i810,$(DRM_MODULES))) ifneq (,$(findstring i810,$(DRM_MODULES)))
CONFIG_DRM_I810 := m CONFIG_DRM_I810 := m
endif endif