diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/char/agp/Kconfig | |
parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/char/agp/Kconfig')
-rw-r--r-- | drivers/char/agp/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index 7f8c1b53b754..486ed8a11b59 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig | |||
@@ -27,7 +27,7 @@ config AGP | |||
27 | 27 | ||
28 | config AGP_ALI | 28 | config AGP_ALI |
29 | tristate "ALI chipset support" | 29 | tristate "ALI chipset support" |
30 | depends on AGP && X86 && !X86_64 | 30 | depends on AGP && X86_32 |
31 | ---help--- | 31 | ---help--- |
32 | This option gives you AGP support for the GLX component of | 32 | This option gives you AGP support for the GLX component of |
33 | XFree86 4.x on the following ALi chipsets. The supported chipsets | 33 | XFree86 4.x on the following ALi chipsets. The supported chipsets |
@@ -45,7 +45,7 @@ config AGP_ALI | |||
45 | 45 | ||
46 | config AGP_ATI | 46 | config AGP_ATI |
47 | tristate "ATI chipset support" | 47 | tristate "ATI chipset support" |
48 | depends on AGP && X86 && !X86_64 | 48 | depends on AGP && X86_32 |
49 | ---help--- | 49 | ---help--- |
50 | This option gives you AGP support for the GLX component of | 50 | This option gives you AGP support for the GLX component of |
51 | XFree86 4.x on the ATI RadeonIGP family of chipsets. | 51 | XFree86 4.x on the ATI RadeonIGP family of chipsets. |
@@ -55,7 +55,7 @@ config AGP_ATI | |||
55 | 55 | ||
56 | config AGP_AMD | 56 | config AGP_AMD |
57 | tristate "AMD Irongate, 761, and 762 chipset support" | 57 | tristate "AMD Irongate, 761, and 762 chipset support" |
58 | depends on AGP && X86 && !X86_64 | 58 | depends on AGP && X86_32 |
59 | help | 59 | help |
60 | This option gives you AGP support for the GLX component of | 60 | This option gives you AGP support for the GLX component of |
61 | XFree86 4.x on AMD Irongate, 761, and 762 chipsets. | 61 | XFree86 4.x on AMD Irongate, 761, and 762 chipsets. |
@@ -91,7 +91,7 @@ config AGP_INTEL | |||
91 | 91 | ||
92 | config AGP_NVIDIA | 92 | config AGP_NVIDIA |
93 | tristate "NVIDIA nForce/nForce2 chipset support" | 93 | tristate "NVIDIA nForce/nForce2 chipset support" |
94 | depends on AGP && X86 && !X86_64 | 94 | depends on AGP && X86_32 |
95 | help | 95 | help |
96 | This option gives you AGP support for the GLX component of | 96 | This option gives you AGP support for the GLX component of |
97 | XFree86 4.x on the following NVIDIA chipsets. The supported chipsets | 97 | XFree86 4.x on the following NVIDIA chipsets. The supported chipsets |
@@ -99,7 +99,7 @@ config AGP_NVIDIA | |||
99 | 99 | ||
100 | config AGP_SIS | 100 | config AGP_SIS |
101 | tristate "SiS chipset support" | 101 | tristate "SiS chipset support" |
102 | depends on AGP && X86 && !X86_64 | 102 | depends on AGP && X86_32 |
103 | help | 103 | help |
104 | This option gives you AGP support for the GLX component of | 104 | This option gives you AGP support for the GLX component of |
105 | XFree86 4.x on Silicon Integrated Systems [SiS] chipsets. | 105 | XFree86 4.x on Silicon Integrated Systems [SiS] chipsets. |
@@ -111,14 +111,14 @@ config AGP_SIS | |||
111 | 111 | ||
112 | config AGP_SWORKS | 112 | config AGP_SWORKS |
113 | tristate "Serverworks LE/HE chipset support" | 113 | tristate "Serverworks LE/HE chipset support" |
114 | depends on AGP && X86 && !X86_64 | 114 | depends on AGP && X86_32 |
115 | help | 115 | help |
116 | Say Y here to support the Serverworks AGP card. See | 116 | Say Y here to support the Serverworks AGP card. See |
117 | <http://www.serverworks.com/> for product descriptions and images. | 117 | <http://www.serverworks.com/> for product descriptions and images. |
118 | 118 | ||
119 | config AGP_VIA | 119 | config AGP_VIA |
120 | tristate "VIA chipset support" | 120 | tristate "VIA chipset support" |
121 | depends on AGP && X86 && !X86_64 | 121 | depends on AGP && X86_32 |
122 | help | 122 | help |
123 | This option gives you AGP support for the GLX component of | 123 | This option gives you AGP support for the GLX component of |
124 | XFree86 4.x on VIA MVP3/Apollo Pro chipsets. | 124 | XFree86 4.x on VIA MVP3/Apollo Pro chipsets. |
@@ -154,7 +154,7 @@ config AGP_UNINORTH | |||
154 | 154 | ||
155 | config AGP_EFFICEON | 155 | config AGP_EFFICEON |
156 | tristate "Transmeta Efficeon support" | 156 | tristate "Transmeta Efficeon support" |
157 | depends on AGP && X86 && !X86_64 | 157 | depends on AGP && X86_32 |
158 | help | 158 | help |
159 | This option gives you AGP support for the Transmeta Efficeon | 159 | This option gives you AGP support for the Transmeta Efficeon |
160 | series processors with integrated northbridges. | 160 | series processors with integrated northbridges. |