diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-06-29 23:20:30 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-06-29 23:20:30 +0000 |
| commit | 1b4ce02506afa65494956468afb0eb7f93b74fbc (patch) | |
| tree | f8dda5cd00156e52fdc2ecb3dff614e4129b2e04 | |
| parent | eeaeefca54b2f8299fbe8f99b5ca71e695430ba7 (diff) | |
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.
| -rw-r--r-- | linux-core/Kconfig | 12 | ||||
| -rw-r--r-- | linux-core/Makefile | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/linux-core/Kconfig b/linux-core/Kconfig index c57a8949..d2ca98f2 100644 --- a/linux-core/Kconfig +++ b/linux-core/Kconfig @@ -74,19 +74,17 @@ endchoice config DRM_MGA tristate "Matrox g200/g400" - depends on DRM && AGP && (!X86_64 || BROKEN) + depends on DRM && (!X86_64 || BROKEN) && (!PPC || BROKEN) help - Choose this option if you have a Matrox G200, G400 or G450 graphics - card. If M is selected, the module will be called mga. AGP - support is required for this driver to work. + Choose this option if you have a Matrox G200, G400, G450 or G550 + graphics card. If M is selected, the module will be called mga. config DRM_SIS tristate "SiS video cards" - depends on DRM && AGP + depends on DRM help Choose this option if you have a SiS 630 or compatible video - chipset. If M is selected the module will be called sis. AGP - support is required for this driver to work. + chipset. If M is selected the module will be called sis. config DRM_VIA tristate "Via unichrome video cards" diff --git a/linux-core/Makefile b/linux-core/Makefile index 4cd11050..70b2a8f7 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -357,13 +357,13 @@ endif ifneq (,$(findstring savage,$(DRM_MODULES))) CONFIG_DRM_SAVAGE := m endif +ifneq (,$(findstring mga,$(DRM_MODULES))) +CONFIG_DRM_MGA := m +endif # These require AGP support ifdef CONFIG_AGP -ifneq (,$(findstring mga,$(DRM_MODULES))) -CONFIG_DRM_MGA := m -endif ifneq (,$(findstring i810,$(DRM_MODULES))) CONFIG_DRM_I810 := m endif |