/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1361_sparc-kconfig-driver-rework.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1361_sparc-kconfig-driver-rework.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download)
Sat Jun 11 23:20:41 2005 UTC (12 years, 7 months ago) by dsd
File size: 14395 byte(s)
Create 2.6.12 branch
1 diff -Naur linux-2.6.10-vanilla/drivers/char/agp/Kconfig linux-2.6.10/drivers/char/agp/Kconfig
2 --- linux-2.6.10-vanilla/drivers/char/agp/Kconfig 2004-12-24 13:34:58.000000000 -0800
3 +++ linux-2.6.10/drivers/char/agp/Kconfig 2004-12-25 03:07:36.000000000 -0800
4 @@ -1,6 +1,7 @@
5 config AGP
6 tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU && !M68K && !ARM
7 default y if GART_IOMMU
8 + depends on PCI
9 ---help---
10 AGP (Accelerated Graphics Port) is a bus system mainly used to
11 connect graphics cards to the rest of the system.
12 diff -Naur linux-2.6.10-vanilla/drivers/char/drm/Kconfig linux-2.6.10/drivers/char/drm/Kconfig
13 --- linux-2.6.10-vanilla/drivers/char/drm/Kconfig 2004-12-24 13:35:25.000000000 -0800
14 +++ linux-2.6.10/drivers/char/drm/Kconfig 2004-12-25 03:07:36.000000000 -0800
15 @@ -17,14 +17,14 @@
16
17 config DRM_TDFX
18 tristate "3dfx Banshee/Voodoo3+"
19 - depends on DRM
20 + depends on DRM && PCI
21 help
22 Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
23 graphics card. If M is selected, the module will be called tdfx.
24
25 config DRM_GAMMA
26 tristate "3dlabs GMX 2000"
27 - depends on DRM && BROKEN
28 + depends on DRM && PCI && BROKEN
29 help
30 This is the old gamma driver, please tell me if it might actually
31 work.
32 @@ -95,3 +95,11 @@
33 chipset. If M is selected the module will be called sis. AGP
34 support is required for this driver to work.
35
36 +config DRM_FFB
37 + tristate "Creator/Creator3D"
38 + depends on DRM && SPARC64
39 + help
40 + Choose this option if you have one of Sun's Creator3D-based graphics
41 + and frame buffer cards. Product page at
42 + <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
43 +
44 diff -Naur linux-2.6.10-vanilla/drivers/char/Kconfig linux-2.6.10/drivers/char/Kconfig
45 --- linux-2.6.10-vanilla/drivers/char/Kconfig 2004-12-24 13:33:49.000000000 -0800
46 +++ linux-2.6.10/drivers/char/Kconfig 2004-12-25 03:08:16.000000000 -0800
47 @@ -80,7 +80,7 @@
48
49 config COMPUTONE
50 tristate "Computone IntelliPort Plus serial support"
51 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
52 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
53 ---help---
54 This driver supports the entire family of Intelliport II/Plus
55 controllers with the exception of the MicroChannel controllers and
56 @@ -95,7 +95,7 @@
57
58 config ROCKETPORT
59 tristate "Comtrol RocketPort support"
60 - depends on SERIAL_NONSTANDARD
61 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
62 help
63 This driver supports Comtrol RocketPort and RocketModem PCI boards.
64 These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
65 @@ -110,7 +110,7 @@
66
67 config CYCLADES
68 tristate "Cyclades async mux support"
69 - depends on SERIAL_NONSTANDARD
70 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
71 ---help---
72 This driver supports Cyclades Z and Y multiserial boards.
73 You would need something like this to connect more than two modems to
74 @@ -138,7 +138,7 @@
75
76 config DIGIEPCA
77 tristate "Digiboard Intelligent Async Support"
78 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
79 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
80 ---help---
81 This is a driver for Digi International's Xx, Xeve, and Xem series
82 of cards which provide multiple serial ports. You would need
83 @@ -157,7 +157,7 @@
84
85 config DIGI
86 tristate "Digiboard PC/Xx Support"
87 - depends on SERIAL_NONSTANDARD && DIGIEPCA=n && BROKEN_ON_SMP
88 + depends on SERIAL_NONSTANDARD && DIGIEPCA=n && BROKEN_ON_SMP && (PCI || ISA)
89 help
90 This is a driver for the Digiboard PC/Xe, PC/Xi, and PC/Xeve cards
91 that give you many serial ports. You would need something like this
92 @@ -183,7 +183,7 @@
93
94 config MOXA_INTELLIO
95 tristate "Moxa Intellio support"
96 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
97 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
98 help
99 Say Y here if you have a Moxa Intellio multiport serial card.
100
101 @@ -192,7 +192,7 @@
102
103 config MOXA_SMARTIO
104 tristate "Moxa SmartIO support"
105 - depends on SERIAL_NONSTANDARD
106 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
107 help
108 Say Y here if you have a Moxa SmartIO multiport serial card.
109
110 @@ -225,7 +225,7 @@
111
112 config SYNCLINKMP
113 tristate "SyncLink Multiport support"
114 - depends on SERIAL_NONSTANDARD
115 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
116 help
117 Enable support for the SyncLink Multiport (2 or 4 ports)
118 serial adapter, running asynchronous and HDLC communications up
119 @@ -251,7 +251,7 @@
120
121 config RISCOM8
122 tristate "SDL RISCom/8 card support"
123 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
124 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
125 help
126 This is a driver for the SDL Communications RISCom/8 multiport card,
127 which gives you many serial ports. You would need something like
128 @@ -264,7 +264,7 @@
129
130 config SPECIALIX
131 tristate "Specialix IO8+ card support"
132 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
133 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
134 help
135 This is a driver for the Specialix IO8+ multiport card (both the
136 ISA and the PCI version) which gives you many serial ports. You
137 @@ -288,7 +288,7 @@
138
139 config SX
140 tristate "Specialix SX (and SI) card support"
141 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
142 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
143 help
144 This is a driver for the SX and SI multiport serial cards.
145 Please read the file <file:Documentation/sx.txt> for details.
146 @@ -299,7 +299,7 @@
147
148 config RIO
149 tristate "Specialix RIO system support"
150 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
151 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
152 help
153 This is a driver for the Specialix RIO, a smart serial card which
154 drives an outboard box that can support up to 128 ports. Product
155 @@ -308,7 +308,7 @@
156
157 config RIO_OLDPCI
158 bool "Support really old RIO/PCI cards"
159 - depends on RIO
160 + depends on RIO && PCI
161 help
162 Older RIO PCI cards need some initialization-time configuration to
163 determine the IRQ and some control addresses. If you have a RIO and
164 @@ -316,7 +316,7 @@
165
166 config STALDRV
167 bool "Stallion multiport serial support"
168 - depends on SERIAL_NONSTANDARD
169 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
170 help
171 Stallion cards give you many serial ports. You would need something
172 like this to connect more than two modems to your Linux box, for
173 @@ -378,6 +378,13 @@
174 If you have an Alchemy AU1000 processor (MIPS based) and you want
175 to use a console on a serial port, say Y. Otherwise, say N.
176
177 +config SUN_AURORA
178 + tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"
179 + depends on SERIAL_NONSTANDARD && EXPERIMENTAL && SBUS && !SUN4
180 + help
181 + The Aurora Multiboard is a multi-port high-speed serial controller.
182 + If you have one of these, say Y.
183 +
184 config QTRONIX_KEYBOARD
185 bool "Enable Qtronix 990P Keyboard Support"
186 depends on IT8712
187 @@ -706,7 +713,8 @@
188
189 config RTC
190 tristate "Enhanced Real Time Clock Support"
191 - depends on !PPC32 && !PARISC && !IA64 && !M68K
192 + depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC32 || PCI) && (!SPARC64 || PCI)
193 + default y if SPARC64
194 ---help---
195 If you say Y here and create a character special file /dev/rtc with
196 major number 10 and minor number 135 using mknod ("man mknod"), you
197 @@ -752,9 +760,20 @@
198 via the file /proc/rtc and its behaviour is set by various ioctls on
199 /dev/rtc.
200
201 +config SUN_MOSTEK_RTC
202 + tristate "Mostek real time clock support"
203 + depends on (SPARC32 || SPARC64)
204 + default y
205 + help
206 + The Mostek RTC chip is used on all known Sun computers except
207 + some JavaStations. For a JavaStation you need to say Y both here
208 + and to "Enhanced Real Time Clock Support".
209 +
210 + Say Y here unless you are building a special purpose kernel.
211 +
212 config GEN_RTC
213 tristate "Generic /dev/rtc emulation"
214 - depends on RTC!=y && !IA64 && !ARM
215 + depends on RTC!=y && !IA64 && !ARM && SUN_MOSTEK_RTC!=y
216 ---help---
217 If you say Y here and create a character special file /dev/rtc with
218 major number 10 and minor number 135 using mknod ("man mknod"), you
219 @@ -807,6 +826,7 @@
220
221 config DTLK
222 tristate "Double Talk PC internal speech card support"
223 + depends on ISA
224 help
225 This driver is for the DoubleTalk PC, a speech synthesizer
226 manufactured by RC Systems (<http://www.rcsys.com/>). It is also
227 @@ -855,6 +875,30 @@
228 To compile this driver as a module, choose M here: the
229 module will be called sonypi.
230
231 +config ENVCTRL
232 + tristate "SUNW,envctrl support"
233 + depends on PCI && SPARC64
234 + help
235 + Kernel support for temperature and fan monitoring on Sun SME
236 + machines.
237 +
238 + To compile this driver as a module, choose M here: the
239 + module will be called envctrl.
240 +
241 +config DISPLAY7SEG
242 + tristate "Sun CPCI 7-Segment Display support"
243 + depends on PCI && SPARC64
244 + ---help---
245 + This is the driver for the 7-segment display and LED present on
246 + Sun Microsystems CompactPCI models CP1400 and CP1500.
247 +
248 + To compile this driver as a module, choose M here: the
249 + module will be called display7seg.
250 +
251 + If you do not have a CompactPCI model CP1400 or CP1500, or
252 + another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
253 + you should say N to this option.
254 +
255
256 menu "Ftape, the floppy tape device driver"
257
258 diff -Naur linux-2.6.10-vanilla/drivers/sbus/char/Kconfig linux-2.6.10/drivers/sbus/char/Kconfig
259 --- linux-2.6.10-vanilla/drivers/sbus/char/Kconfig 2004-12-24 13:35:28.000000000 -0800
260 +++ linux-2.6.10/drivers/sbus/char/Kconfig 2004-12-25 03:07:36.000000000 -0800
261 @@ -13,15 +13,6 @@
262
263 If unsure, say Y.
264
265 -config SUN_MOSTEK_RTC
266 - tristate "Mostek real time clock support"
267 - help
268 - The Mostek RTC chip is used on all known Sun computers except
269 - some JavaStations. For a JavaStation you need to say Y both here
270 - and to "Enhanced Real Time Clock Support".
271 -
272 - Say Y here unless you are building a special purpose kernel.
273 -
274 config OBP_FLASH
275 tristate "OBP Flash Device support"
276 depends on SPARC64
277 @@ -69,25 +60,16 @@
278 If you say Y here, you will be able to boot from your JavaStation's
279 Flash memory.
280
281 -# XXX Why don't we do "source drivers/char/Config.in" somewhere?
282 -# no shit
283 -config APM_RTC_IS_GMT
284 - bool
285 - depends on EXPERIMENTAL && SPARC32 && PCI
286 - default y
287 - help
288 - Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
289 - stores the time in GMT (Greenwich Mean Time). Say N if your RTC
290 - stores localtime.
291 -
292 - It is in fact recommended to store GMT in your RTC, because then you
293 - don't have to worry about daylight savings time changes. The only
294 - reason not to use GMT in your RTC is if you also run a broken OS
295 - that doesn't understand GMT.
296 -
297 -config RTC
298 - tristate "PC-style Real Time Clock Support"
299 - depends on PCI && EXPERIMENTAL && SPARC32
300 +config BBC_I2C
301 + tristate "UltraSPARC-III bootbus i2c controller driver"
302 + depends on SPARC64 && PCI
303 + help
304 + The BBC devices on the UltraSPARC III have two I2C controllers. The
305 + first I2C controller connects mainly to configuration PROMs (NVRAM,
306 + CPU configuration, DIMM types, etc.). The second I2C controller
307 + connects to environmental control devices such as fans and
308 + temperature sensors. The second controller also connects to the
309 + smartcard reader, if present. Say Y to enable support for these.
310
311 endmenu
312
313 diff -Naur linux-2.6.10-vanilla/drivers/sbus/Makefile linux-2.6.10/drivers/sbus/Makefile
314 --- linux-2.6.10-vanilla/drivers/sbus/Makefile 2004-12-24 13:35:29.000000000 -0800
315 +++ linux-2.6.10/drivers/sbus/Makefile 2004-12-25 03:07:36.000000000 -0800
316 @@ -6,4 +6,4 @@
317 obj-y := sbus.o dvma.o
318 endif
319
320 -obj-$(CONFIG_SBUSCHAR) += char/
321 +obj-y += char/
322 diff -Naur linux-2.6.10-vanilla/drivers/video/Kconfig linux-2.6.10/drivers/video/Kconfig
323 --- linux-2.6.10-vanilla/drivers/video/Kconfig 2004-12-24 13:33:49.000000000 -0800
324 +++ linux-2.6.10/drivers/video/Kconfig 2004-12-25 03:07:36.000000000 -0800
325 @@ -397,25 +397,6 @@
326 bool "Sun3 framebuffer support"
327 depends on FB && (SUN3 || SUN3X) && BROKEN
328
329 -config FB_BW2
330 - bool "BWtwo support"
331 - depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
332 - help
333 - This is the frame buffer device driver for the BWtwo frame buffer.
334 -
335 -config FB_CG3
336 - bool "CGthree support"
337 - depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
338 - help
339 - This is the frame buffer device driver for the CGthree frame buffer.
340 -
341 -config FB_CG6
342 - bool "CGsix (GX,TurboGX) support"
343 - depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
344 - help
345 - This is the frame buffer device driver for the CGsix (GX, TurboGX)
346 - frame buffer.
347 -
348 config FB_PVR2
349 tristate "NEC PowerVR 2 display support"
350 depends on FB && SH_DREAMCAST
351 @@ -952,6 +933,25 @@
352 This is the frame buffer device driver for the Creator, Creator3D,
353 and Elite3D graphics boards.
354
355 +config FB_BW2
356 + bool "BWtwo support"
357 + depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
358 + help
359 + This is the frame buffer device driver for the BWtwo frame buffer.
360 +
361 +config FB_CG3
362 + bool "CGthree support"
363 + depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
364 + help
365 + This is the frame buffer device driver for the CGthree frame buffer.
366 +
367 +config FB_CG6
368 + bool "CGsix (GX,TurboGX) support"
369 + depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
370 + help
371 + This is the frame buffer device driver for the CGsix (GX, TurboGX)
372 + frame buffer.
373 +
374 config FB_TCX
375 bool "TCX (SS4/SS5 only) support"
376 depends on FB_SBUS
377 diff -Naur linux-2.6.10-vanilla/fs/Kconfig linux-2.6.10/fs/Kconfig
378 --- linux-2.6.10-vanilla/fs/Kconfig 2004-12-24 13:34:58.000000000 -0800
379 +++ linux-2.6.10/fs/Kconfig 2004-12-25 03:07:36.000000000 -0800
380 @@ -972,6 +972,20 @@
381 To compile this as a module, choose M here: the module will be called
382 ramfs.
383
384 +config SUN_OPENPROMFS
385 + depends on SPARC32 || SPARC64
386 + tristate "OpenPROM file system"
387 + help
388 + If you say Y, the OpenPROM device tree will be available as a
389 + virtual file system, which you can mount to /proc/openprom by "mount
390 + -t openpromfs none /proc/openprom".
391 +
392 + To compile the /proc/openprom support as a module, choose M here: the
393 + module will be called openpromfs.
394 +
395 + Only choose N if you know in advance that you will not need to modify
396 + OpenPROM settings on the running system.
397 +
398 endmenu
399
400 menu "Miscellaneous filesystems"

  ViewVC Help
Powered by ViewVC 1.1.20