diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-30 14:54:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-30 14:54:32 -0400 |
| commit | e60a48f5ab35737118e19bc965c640900a842f02 (patch) | |
| tree | 2dfc418bc3df4a73d51e45be1030f5692d0303a6 /drivers/char/agp/Kconfig | |
| parent | 2c56554ec596adadd562679ef672d83e290f1732 (diff) | |
| parent | 7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] VIA PT880 Ultra support.
[AGPGART] Fix Nforce3 suspend on amd64.
[AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems
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. |