/[linux-patches]/genpatches-2.6/trunk/2.6.13-pre/1360_sparc-kconfig-depends.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.13-pre/1360_sparc-kconfig-depends.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 126 Revision 127
1diff -Naurp linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig
2--- linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig 2005-07-24 14:07:00.674871749 -0700
3+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 2005-07-24 14:05:19.719578022 -0700
4@@ -25,7 +25,7 @@ config DRM_TDFX
5
6 config DRM_GAMMA
7 tristate "3dlabs GMX 2000"
8- depends on DRM && BROKEN
9+ depends on DRM && PCI && BROKEN
10 help
11 This is the old gamma driver, please tell me if it might actually
12 work.
13diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 1diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig
14--- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-24 14:07:00.675871584 -0700 2--- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-24 14:07:00.675871584 -0700
15+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-24 14:05:19.753572397 -0700 3+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-24 14:05:19.753572397 -0700
16@@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD 4@@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD
17 5
146 tristate "Double Talk PC internal speech card support" 134 tristate "Double Talk PC internal speech card support"
147+ depends on ISA 135+ depends on ISA
148 help 136 help
149 This driver is for the DoubleTalk PC, a speech synthesizer 137 This driver is for the DoubleTalk PC, a speech synthesizer
150 manufactured by RC Systems (<http://www.rcsys.com/>). It is also 138 manufactured by RC Systems (<http://www.rcsys.com/>). It is also
151diff -Naurp linux-2.6.13-rc3-git4/drivers/video/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/video/Kconfig
152--- linux-2.6.13-rc3-git4/drivers/video/Kconfig 2005-07-24 14:07:00.710865792 -0700
153+++ linux-2.6.13-rc3-git4-gentoo/drivers/video/Kconfig 2005-07-24 14:16:29.767633762 -0700
154@@ -573,39 +573,6 @@ config BUS_I2C
155 depends on (FB = y) && VISWS
156 default y
157
158-config FB_SUN3
159- bool "Sun3 framebuffer support"
160- depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
161-
162-config FB_BW2
163- bool "BWtwo support"
164- depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
165- select FB_CFB_FILLRECT
166- select FB_CFB_COPYAREA
167- select FB_CFB_IMAGEBLIT
168- select FB_SOFT_CURSOR
169- help
170- This is the frame buffer device driver for the BWtwo frame buffer.
171-
172-config FB_CG3
173- bool "CGthree support"
174- depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
175- select FB_CFB_COPYAREA
176- select FB_CFB_IMAGEBLIT
177- select FB_SOFT_CURSOR
178- help
179- This is the frame buffer device driver for the CGthree frame buffer.
180-
181-config FB_CG6
182- bool "CGsix (GX,TurboGX) support"
183- depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
184- select FB_CFB_COPYAREA
185- select FB_CFB_IMAGEBLIT
186- select FB_SOFT_CURSOR
187- help
188- This is the frame buffer device driver for the CGsix (GX, TurboGX)
189- frame buffer.
190-
191 config FB_PVR2
192 tristate "NEC PowerVR 2 display support"
193 depends on FB && SH_DREAMCAST
194@@ -1259,15 +1226,38 @@ config FB_SBUS
195 help
196 Say Y if you want support for SBUS or UPA based frame buffer device.
197
198-config FB_FFB
199- bool "Creator/Creator3D/Elite3D support"
200- depends on FB_SBUS && SPARC64
201+config FB_SUN3
202+ bool "Sun3 framebuffer support"
203+ depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
204+
205+config FB_BW2
206+ bool "BWtwo support"
207+ depends on FB_SBUS || FB_SUN3
208+ select FB_CFB_FILLRECT
209 select FB_CFB_COPYAREA
210 select FB_CFB_IMAGEBLIT
211 select FB_SOFT_CURSOR
212 help
213- This is the frame buffer device driver for the Creator, Creator3D,
214- and Elite3D graphics boards.
215+ This is the frame buffer device driver for the BWtwo frame buffer.
216+
217+config FB_CG3
218+ bool "CGthree support"
219+ depends on FB_SBUS || FB_SUN3
220+ select FB_CFB_COPYAREA
221+ select FB_CFB_IMAGEBLIT
222+ select FB_SOFT_CURSOR
223+ help
224+ This is the frame buffer device driver for the CGthree frame buffer.
225+
226+config FB_CG6
227+ bool "CGsix (GX,TurboGX) support"
228+ depends on FB_SBUS || FB_SUN3
229+ select FB_CFB_COPYAREA
230+ select FB_CFB_IMAGEBLIT
231+ select FB_SOFT_CURSOR
232+ help
233+ This is the frame buffer device driver for the CGsix (GX, TurboGX)
234+ frame buffer.
235
236 config FB_TCX
237 bool "TCX (SS4/SS5 only) support"
238@@ -1313,6 +1303,16 @@ config FB_LEO
239 This is the frame buffer device driver for the SBUS-based Sun ZX
240 (leo) frame buffer cards.
241
242+config FB_FFB
243+ bool "Creator/Creator3D/Elite3D support"
244+ depends on FB_SBUS && SPARC64
245+ select FB_CFB_COPYAREA
246+ select FB_CFB_IMAGEBLIT
247+ select FB_SOFT_CURSOR
248+ help
249+ This is the frame buffer device driver for the Creator, Creator3D,
250+ and Elite3D graphics boards.
251+
252 config FB_PCI
253 bool "PCI framebuffers"
254 depends on (FB = y) && PCI && (SPARC64 || SPARC32)

Legend:
Removed from v.126  
changed lines
  Added in v.127

  ViewVC Help
Powered by ViewVC 1.1.20