Merge ../linus

[linux-drm-fsl-dcu.git] / drivers / char / agp / Kconfig

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index c603bf2915803e0e9d243b6d82d5db317780b473..a9f9c48c2424c8f307061bdf7feda686d7a996ab 100644 (file)
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -86,7 +86,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
        tristate "SiS chipset support"
-       depends on AGP
+       depends on AGP && X86
        help
          This option gives you AGP support for the GLX component of
          X on Silicon Integrated Systems [SiS] chipsets.
@@ -103,7 +103,7 @@ config AGP_SWORKS
 
 config AGP_VIA
        tristate "VIA chipset support"
-       depends on AGP
+       depends on AGP && X86
        help
          This option gives you AGP support for the GLX component of
          X on VIA MVP3/Apollo Pro chipsets.