diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /drivers/char/agp/Kconfig | |
| parent | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/char/agp/Kconfig')
| -rw-r--r-- | drivers/char/agp/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index 0b9cf9c59a21..7c88c060a9e6 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig | |||
| @@ -86,7 +86,7 @@ config AGP_NVIDIA | |||
| 86 | 86 | ||
| 87 | config AGP_SIS | 87 | config AGP_SIS |
| 88 | tristate "SiS chipset support" | 88 | tristate "SiS chipset support" |
| 89 | depends on AGP && X86_32 | 89 | depends on AGP |
| 90 | help | 90 | help |
| 91 | This option gives you AGP support for the GLX component of | 91 | This option gives you AGP support for the GLX component of |
| 92 | X on Silicon Integrated Systems [SiS] chipsets. | 92 | X on Silicon Integrated Systems [SiS] chipsets. |