summaryrefslogtreecommitdiff
path: root/scripts/kconfig/fixup-all.diff
Unidiff
Diffstat (limited to 'scripts/kconfig/fixup-all.diff') (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/kconfig/fixup-all.diff925
1 files changed, 925 insertions, 0 deletions
diff --git a/scripts/kconfig/fixup-all.diff b/scripts/kconfig/fixup-all.diff
new file mode 100644
index 0000000..0844c98
--- a/dev/null
+++ b/scripts/kconfig/fixup-all.diff
@@ -0,0 +1,925 @@
1 --- ./arch/alpha/Kconfig.org2002-10-16 17:09:12.000000000 +0200
2 +++ ./arch/alpha/Kconfig2002-10-16 17:12:17.000000000 +0200
3@@ -791,10 +791,10 @@
4
5 endmenu
6
7-#if [ "$CONFIG_PCI" = "y" ]; then
8+if PCI
9 source "drivers/message/fusion/Kconfig"
10+endif
11
12-#fi
13 source "net/Kconfig"
14
15
16@@ -1046,5 +1046,3 @@
17
18 source "lib/Kconfig"
19
20-source "Kconfig"
21-
22 --- ./arch/arm/Kconfig.org2002-10-16 17:09:13.000000000 +0200
23 +++ ./arch/arm/Kconfig2002-10-16 17:12:17.000000000 +0200
24@@ -876,10 +876,10 @@
25
26 source "drivers/parport/Kconfig"
27
28-#if [ "$CONFIG_ALIGNMENT_TRAP" = "y" ]; then
29+if ALIGNMENT_TRAP
30 source "drivers/mtd/Kconfig"
31+endif
32
33-#else
34 source "drivers/pnp/Kconfig"
35
36 source "drivers/block/Kconfig"
37@@ -1233,5 +1233,3 @@
38
39 source "lib/Kconfig"
40
41-source "Kconfig"
42-
43 --- ./arch/cris/Kconfig.org2002-10-16 17:09:14.000000000 +0200
44 +++ ./arch/cris/Kconfig2002-10-16 17:12:17.000000000 +0200
45@@ -749,5 +749,3 @@
46
47 source "lib/Kconfig"
48
49-source "Kconfig"
50-
51 --- ./arch/i386/Kconfig.org2002-10-16 17:09:15.000000000 +0200
52 +++ ./arch/i386/Kconfig2002-10-16 17:12:17.000000000 +0200
53@@ -1430,7 +1430,8 @@
54 Read the file <file:Documentation/svga.txt> for more information
55 about the Video mode selection support. If unsure, say N.
56
57-#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
58+if EXPERIMENTAL
59+
60 config MDA_CONSOLE
61 tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
62 ---help---
63@@ -1449,7 +1450,8 @@
64
65 source "drivers/video/Kconfig"
66
67-#fi
68+endif
69+
70 endmenu
71
72
73@@ -1625,5 +1627,3 @@
74 bool
75 default y
76
77-source "Kconfig"
78-
79 --- ./arch/ia64/Kconfig.org2002-10-16 17:09:16.000000000 +0200
80 +++ ./arch/ia64/Kconfig2002-10-16 17:12:17.000000000 +0200
81@@ -120,43 +120,10 @@
82
83 choice
84 prompt "Kernel page size"
85 -depends on ITANIUM
86 -default IA64_PAGE_SIZE_16KB_1
87-
88-config IA64_PAGE_SIZE_4KB_1
89 -bool "4KB"
90-
91-config IA64_PAGE_SIZE_8KB_1
92 -bool "8KB"
93-
94-config IA64_PAGE_SIZE_16KB_1
95 -bool "16KB"
96-
97-endchoice
98-
99-choice
100 -prompt "Kernel page size"
101 -depends on !ITANIUM
102 -default IA64_PAGE_SIZE_16KB_2
103-
104-config IA64_PAGE_SIZE_4KB_2
105 -bool "4KB"
106-
107-config IA64_PAGE_SIZE_8KB_2
108 -bool "8KB"
109-
110-config IA64_PAGE_SIZE_16KB_2
111 -bool "16KB"
112-
113-config IA64_PAGE_SIZE_64KB
114 -bool "64KB"
115-
116-endchoice
117 +default IA64_PAGE_SIZE_16KB
118
119 config IA64_PAGE_SIZE_4KB
120 -bool
121 -depends on IA64_PAGE_SIZE_4KB_1 || IA64_PAGE_SIZE_4KB_2
122 -default y
123 +bool "4KB"
124 ---help---
125 This lets you select the page size of the kernel. For best IA-64
126 performance, a page size of 8KB or 16KB is recommended. For best
127@@ -173,14 +140,16 @@
128 If you don't know what to do, choose 8KB.
129
130 config IA64_PAGE_SIZE_8KB
131 -bool
132 -depends on IA64_PAGE_SIZE_8KB_1 || IA64_PAGE_SIZE_8KB_2
133 -default y
134 +bool "8KB"
135
136 config IA64_PAGE_SIZE_16KB
137 -bool
138 -depends on IA64_PAGE_SIZE_16KB_1 || IA64_PAGE_SIZE_16KB_2
139 -default y
140 +bool "16KB"
141+
142+config IA64_PAGE_SIZE_64KB
143 +depends on !ITANIUM
144 +bool "64KB"
145+
146+endchoice
147
148 config ACPI
149 bool
150@@ -403,87 +372,33 @@
151
152 choice
153 prompt "IA-64 Huge TLB Page Size"
154 -depends on HUGETLB_PAGE && MCKINLEY
155 -default HUGETLB_PAGE_SIZE_16MB_1
156 +depends on HUGETLB_PAGE
157 +default HUGETLB_PAGE_SIZE_16MB
158
159 config HUGETLB_PAGE_SIZE_4GB
160 +depends on MCKINLEY
161 bool "4GB"
162
163-config HUGETLB_PAGE_SIZE_256MB_1
164 -bool "256MB"
165-
166-config HUGETLB_PAGE_SIZE_64MB_1
167 -bool "64MB"
168-
169-config HUGETLB_PAGE_SIZE_16MB_1
170 -bool "16MB"
171-
172-config HUGETLB_PAGE_SIZE_4MB_1
173 -bool "4MB"
174-
175-config HUGETLB_PAGE_SIZE_1MB_1
176 -bool "1MB"
177-
178-config HUGETLB_PAGE_SIZE_256KB_1
179 -bool "256KB"
180-
181-endchoice
182-
183-choice
184 -prompt "IA-64 Huge TLB Page Size"
185 -depends on HUGETLB_PAGE && !MCKINLEY
186 -default HUGETLB_PAGE_SIZE_16MB_2
187-
188-config HUGETLB_PAGE_SIZE_256MB_2
189+config HUGETLB_PAGE_SIZE_256MB
190 bool "256MB"
191
192-config HUGETLB_PAGE_SIZE_64MB_2
193+config HUGETLB_PAGE_SIZE_64MB
194 bool "64MB"
195
196-config HUGETLB_PAGE_SIZE_16MB_2
197+config HUGETLB_PAGE_SIZE_16MB
198 bool "16MB"
199
200-config HUGETLB_PAGE_SIZE_4MB_2
201+config HUGETLB_PAGE_SIZE_4MB
202 bool "4MB"
203
204-config HUGETLB_PAGE_SIZE_1MB_2
205+config HUGETLB_PAGE_SIZE_1MB
206 bool "1MB"
207
208-config HUGETLB_PAGE_SIZE_256KB_2
209+config HUGETLB_PAGE_SIZE_256KB
210 bool "256KB"
211
212 endchoice
213
214-config HUGETLB_PAGE_SIZE_256MB
215 -bool
216 -depends on HUGETLB_PAGE_SIZE_256MB_1 || HUGETLB_PAGE_SIZE_256MB_2
217 -default y
218-
219-config HUGETLB_PAGE_SIZE_64MB
220 -bool
221 -depends on HUGETLB_PAGE_SIZE_64MB_1 || HUGETLB_PAGE_SIZE_64MB_2
222 -default y
223-
224-config HUGETLB_PAGE_SIZE_16MB
225 -bool
226 -depends on HUGETLB_PAGE_SIZE_16MB_1 || HUGETLB_PAGE_SIZE_16MB_2
227 -default y
228-
229-config HUGETLB_PAGE_SIZE_4MB
230 -bool
231 -depends on HUGETLB_PAGE_SIZE_4MB_1 || HUGETLB_PAGE_SIZE_4MB_2
232 -default y
233-
234-config HUGETLB_PAGE_SIZE_1MB
235 -bool
236 -depends on HUGETLB_PAGE_SIZE_1MB_1 || HUGETLB_PAGE_SIZE_1MB_2
237 -default y
238-
239-config HUGETLB_PAGE_SIZE_256KB
240 -bool
241 -depends on HUGETLB_PAGE_SIZE_256KB_1 || HUGETLB_PAGE_SIZE_256KB_2
242 -default y
243-
244 config SMP
245 bool "SMP support"
246 ---help---
247@@ -608,7 +523,8 @@
248 you have use for it; the module is called binfmt_misc.o. If you
249 don't know what to answer at this point, say Y.
250
251-#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
252+if !IA64_HP_SIM
253+
254 source "drivers/acpi/Kconfig"
255
256 config PCI
257@@ -650,10 +566,12 @@
258
259 source "drivers/parport/Kconfig"
260
261-#fi # !HP_SIM
262+endif
263+
264 endmenu
265
266-#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
267+if !IA64_HP_SIM
268+
269 source "drivers/mtd/Kconfig"
270
271 source "drivers/pnp/Kconfig"
272@@ -721,7 +639,8 @@
273
274 endmenu
275
276-#fi
277+endif
278+
279
280 menu "SCSI support"
281
282@@ -751,7 +670,8 @@
283
284 source "net/Kconfig"
285
286-#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
287+
288+if !IA64_HP_SIM
289
290 menu "Network device support"
291 depends on NET
292@@ -841,7 +761,8 @@
293 #source drivers/misc/Config.in
294 source "drivers/media/Kconfig"
295
296-#else # HP_SIM
297+endif
298+
299
300 menu "Block devices"
301 depends on IA64_HP_SIM
302@@ -863,10 +784,10 @@
303
304 endmenu
305
306-# HP_SIM
307 source "fs/Kconfig"
308
309-#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
310+if !IA64_HP_SIM
311+
312
313 menu "Console drivers"
314 depends on VT
315@@ -936,7 +857,8 @@
316
317 source "net/bluetooth/Kconfig"
318
319-#fi # !HP_SIM
320+endif
321+
322 source "arch/ia64/hp/sim/Kconfig"
323
324
325@@ -1058,5 +980,3 @@
326
327 source "security/Kconfig"
328
329-source "Kconfig"
330-
331 --- ./arch/m68k/Kconfig.org2002-10-16 17:09:18.000000000 +0200
332 +++ ./arch/m68k/Kconfig2002-10-16 17:12:17.000000000 +0200
333@@ -634,10 +634,10 @@
334
335 source "drivers/zorro/Kconfig"
336
337-#if [ "$CONFIG_Q40" = "y" ]; then
338+if Q40
339 source "drivers/pnp/Kconfig"
340+endif
341
342-#fi
343 endmenu
344
345 source "drivers/mtd/Kconfig"
346@@ -646,10 +646,10 @@
347
348 source "drivers/md/Kconfig"
349
350-#if [ "$CONFIG_MAC" = "y" ]; then
351+if MAC
352 source "drivers/input/Kconfig"
353+endif
354
355-#fi
356
357 menu "ATA/ATAPI/MFM/RLL device support"
358
359@@ -2382,5 +2382,3 @@
360
361 source "lib/Kconfig"
362
363-source "Kconfig"
364-
365 --- ./arch/mips/Kconfig.org2002-10-16 17:09:20.000000000 +0200
366 +++ ./arch/mips/Kconfig2002-10-16 17:12:17.000000000 +0200
367@@ -810,10 +810,11 @@
368 # fi
369 endmenu
370
371-#if [ "$CONFIG_ISA" = "y" ]; then
372+
373+if ISA
374 source "drivers/pnp/Kconfig"
375+endif
376
377-#fi
378 source "drivers/mtd/Kconfig"
379
380 source "drivers/parport/Kconfig"
381@@ -903,11 +904,11 @@
382
383 endmenu
384
385-#if [ "$CONFIG_DECSTATION" != "y" -a \
386-# "$CONFIG_SGI_IP22" != "y" ]; then
387+
388+if !DECSTATION" && !SGI_IP22
389 source "drivers/message/i2o/Kconfig"
390+endif
391
392-#fi
393 source "net/Kconfig"
394
395
396@@ -1200,7 +1201,8 @@
397
398 Say Y.
399
400-#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
401+if EXPERIMENTAL
402+
403 config MDA_CONSOLE
404 tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
405 ---help---
406@@ -1219,7 +1221,8 @@
407
408 source "drivers/video/Kconfig"
409
410-#fi
411+endif
412+
413 endmenu
414
415
416@@ -1333,5 +1336,3 @@
417
418 source "lib/Kconfig"
419
420-source "Kconfig"
421-
422 --- ./arch/mips64/Kconfig.org2002-10-16 17:09:22.000000000 +0200
423 +++ ./arch/mips64/Kconfig2002-10-16 17:12:17.000000000 +0200
424@@ -735,5 +735,3 @@
425
426 source "lib/Kconfig"
427
428-source "Kconfig"
429-
430 --- ./arch/parisc/Kconfig.org2002-10-16 17:09:22.000000000 +0200
431 +++ ./arch/parisc/Kconfig2002-10-16 17:12:17.000000000 +0200
432@@ -759,5 +759,3 @@
433
434 source "lib/Kconfig"
435
436-source "Kconfig"
437-
438 --- ./arch/ppc/Kconfig.org2002-10-16 17:09:23.000000000 +0200
439 +++ ./arch/ppc/Kconfig2002-10-16 17:12:17.000000000 +0200
440@@ -1826,5 +1826,3 @@
441
442 source "security/Kconfig"
443
444-source "Kconfig"
445-
446 --- ./arch/ppc64/Kconfig.org2002-10-16 17:09:24.000000000 +0200
447 +++ ./arch/ppc64/Kconfig2002-10-16 17:12:17.000000000 +0200
448@@ -525,5 +525,3 @@
449
450 source "lib/Kconfig"
451
452-source "Kconfig"
453-
454 --- ./arch/s390/Kconfig.org2002-10-16 17:09:25.000000000 +0200
455 +++ ./arch/s390/Kconfig2002-10-16 17:12:17.000000000 +0200
456@@ -318,5 +318,3 @@
457
458 source "lib/Kconfig"
459
460-source "Kconfig"
461-
462 --- ./arch/s390x/Kconfig.org2002-10-16 17:09:25.000000000 +0200
463 +++ ./arch/s390x/Kconfig2002-10-16 17:12:17.000000000 +0200
464@@ -326,5 +326,3 @@
465
466 source "lib/Kconfig"
467
468-source "Kconfig"
469-
470 --- ./arch/sh/Kconfig.org2002-10-16 17:09:25.000000000 +0200
471 +++ ./arch/sh/Kconfig2002-10-16 17:12:17.000000000 +0200
472@@ -1214,7 +1214,8 @@
473 Read the file <file:Documentation/svga.txt> for more information
474 about the Video mode selection support. If unsure, say N.
475
476-#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
477+if EXPERIMENTAL
478+
479 config MDA_CONSOLE
480 tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
481 ---help---
482@@ -1233,7 +1234,8 @@
483
484 source "drivers/video/Kconfig"
485
486-#fi
487+endif
488+
489 endmenu
490
491
492@@ -1319,5 +1321,3 @@
493
494 source "lib/Kconfig"
495
496-source "Kconfig"
497-
498 --- ./arch/sparc/Kconfig.org2002-10-16 17:09:28.000000000 +0200
499 +++ ./arch/sparc/Kconfig2002-10-16 17:12:17.000000000 +0200
500@@ -238,7 +238,8 @@
501 a kernel compiled with this option will run only on Sun4.
502 (And the current version will probably work only on sun4/330.)
503
504-#if [ "$CONFIG_SUN4" != "y" ]; then
505+if !SUN4
506+
507 config PCI
508 bool "Support for PCI and PS/2 keyboard/mouse"
509 help
510@@ -254,7 +255,8 @@
511
512 source "drivers/pci/Kconfig"
513
514-#else
515+endif
516+
517 config SUN_OPENPROMFS
518 tristate "Openprom tree appears in /proc/openprom"
519 help
520@@ -429,10 +431,10 @@
521
522 source "drivers/serial/Kconfig"
523
524-#if [ "$CONFIG_SUN4" != "y" ]; then
525+if !SUN4
526 source "drivers/sbus/char/Kconfig"
527+endif
528
529-#fi
530
531 menu "Block devices"
532
533@@ -575,7 +577,7 @@
534 endmenu
535
536 # Don't frighten a common SBus user
537-#if [ "$CONFIG_PCI" = "y" ]; then
538+if PCI
539
540 menu "ATA/ATAPI/MFM/RLL support"
541
542@@ -629,7 +631,8 @@
543
544 endmenu
545
546-#else
547+endif
548+
549 source "drivers/isdn/Kconfig"
550
551
552@@ -1419,5 +1422,3 @@
553
554 source "lib/Kconfig"
555
556-source "Kconfig"
557-
558 --- ./arch/sparc64/Kconfig.org2002-10-16 17:09:28.000000000 +0200
559 +++ ./arch/sparc64/Kconfig2002-10-16 17:12:17.000000000 +0200
560@@ -978,12 +978,58 @@
561 whenever you want). If you want to compile it as a module, say M
562 here and read <file:Documentation/modules.txt>.
563
564-#if [ "$CONFIG_PCI" != "n" ]; then
565+
566+choice
567 +prompt "Adaptec AIC7xxx support"
568 +optional
569 +depends on SCSI && PCI
570+
571 source "drivers/scsi/aic7xxx/Kconfig"
572
573+config SCSI_AIC7XXX_OLD
574 +tristate "Old driver"
575 +---help---
576 + WARNING This driver is an older aic7xxx driver and is no longer
577 + under active development. Adaptec, Inc. is writing a new driver to
578 + take the place of this one, and it is recommended that whenever
579 + possible, people should use the new Adaptec written driver instead
580 + of this one. This driver will eventually be phased out entirely.
581+
582 + This is support for the various aic7xxx based Adaptec SCSI
583 + controllers. These include the 274x EISA cards; 284x VLB cards;
584 + 2902, 2910, 293x, 294x, 394x, 3985 and several other PCI and
585 + motherboard based SCSI controllers from Adaptec. It does not support
586 + the AAA-13x RAID controllers from Adaptec, nor will it likely ever
587 + support them. It does not support the 2920 cards from Adaptec that
588 + use the Future Domain SCSI controller chip. For those cards, you
589 + need the "Future Domain 16xx SCSI support" driver.
590+
591 + In general, if the controller is based on an Adaptec SCSI controller
592 + chip from the aic777x series or the aic78xx series, this driver
593 + should work. The only exception is the 7810 which is specifically
594 + not supported (that's the RAID controller chip on the AAA-13x
595 + cards).
596+
597 + Note that the AHA2920 SCSI host adapter is *not* supported by this
598 + driver; choose "Future Domain 16xx SCSI support" instead if you have
599 + one of those.
600+
601 + Information on the configuration options for this controller can be
602 + found by checking the help file for each of the available
603 + configuration options. You should read
604 + <file:drivers/scsi/aic7xxx_old/README.aic7xxx> at a minimum before
605 + contacting the maintainer with any questions. The SCSI-HOWTO,
606 + available from <http://www.linuxdoc.org/docs.html#howto>, can also
607 + be of great help.
608+
609 + If you want to compile this driver as a module ( = code which can be
610 + inserted in and removed from the running kernel whenever you want),
611 + say M here and read <file:Documentation/modules.txt>. The module
612 + will be called aic7xxx_old.o.
613+
614 config AIC7XXX_OLD_TCQ_ON_BY_DEFAULT
615 bool "Enable Tagged Command Queueing (TCQ) by default"
616 -depends on SCSI_AIC7XXX!=y && SCSI_AIC7XXX_OLD
617 +depends on SCSI_AIC7XXX_OLD
618 ---help---
619 This option causes the aic7xxx driver to attempt to use Tagged
620 Command Queueing (TCQ) on all devices that claim to support it.
621@@ -1019,7 +1065,7 @@
622
623 config AIC7XXX_OLD_CMDS_PER_DEVICE
624 int "Maximum number of TCQ commands per device"
625 -depends on SCSI_AIC7XXX!=y && SCSI_AIC7XXX_OLD
626 +depends on SCSI_AIC7XXX_OLD
627 default "8"
628 ---help---
629 Specify the number of commands you would like to allocate per SCSI
630@@ -1043,7 +1089,7 @@
631
632 config AIC7XXX_OLD_PROC_STATS
633 bool "Collect statistics to report in /proc"
634 -depends on SCSI_AIC7XXX!=y && SCSI_AIC7XXX_OLD
635 +depends on SCSI_AIC7XXX_OLD
636 ---help---
637 This option tells the driver to keep track of how many commands have
638 been sent to each particular device and report that information to
639@@ -1056,6 +1102,8 @@
640
641 If unsure, say N.
642
643+endchoice
644+
645 config SCSI_SYM53C8XX_2
646 tristate "SYM53C8XX Version 2 SCSI support"
647 depends on PCI && SCSI
648@@ -1346,10 +1394,10 @@
649
650 source "drivers/fc4/Kconfig"
651
652-#if [ "$CONFIG_PCI" = "y" ]; then
653+if PCI
654 source "drivers/message/fusion/Kconfig"
655+endif
656
657-#fi
658 source "drivers/ieee1394/Kconfig"
659
660 source "net/Kconfig"
661@@ -1651,5 +1699,3 @@
662
663 source "lib/Kconfig"
664
665-source "Kconfig"
666-
667 --- ./arch/x86_64/Kconfig.org2002-10-16 17:09:29.000000000 +0200
668 +++ ./arch/x86_64/Kconfig2002-10-16 17:12:17.000000000 +0200
669@@ -592,7 +592,8 @@
670 Read the file <file:Documentation/svga.txt> for more information
671 about the Video mode selection support. If unsure, say N.
672
673-#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
674+if EXPERIMENTAL
675+
676 config MDA_CONSOLE
677 tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
678 ---help---
679@@ -611,7 +612,8 @@
680
681 source "drivers/video/Kconfig"
682
683-#fi
684+endif
685+
686 endmenu
687
688
689@@ -713,5 +715,3 @@
690
691 source "lib/Kconfig"
692
693-source "Kconfig"
694-
695 --- ./arch/um/Kconfig.org2002-10-16 17:09:29.000000000 +0200
696 +++ ./arch/um/Kconfig2002-10-16 17:12:17.000000000 +0200
697@@ -163,5 +163,3 @@
698
699 endmenu
700
701-source "Kconfig"
702-
703 --- ./drivers/isdn/eicon/Kconfig.org2002-10-16 17:09:15.000000000 +0200
704 +++ ./drivers/isdn/eicon/Kconfig2002-10-16 17:12:17.000000000 +0200
705@@ -11,12 +11,12 @@
706 <file:Documentation/isdn/README.eicon> for more information.
707
708 choice
709 -prompt "change me!"
710 +prompt "Eicon active card support"
711 optional
712 depends on ISDN_DRV_EICON && ISDN
713
714 config ISDN_DRV_EICON_DIVAS
715 -tristate "Build Eicon driver type standalone"
716 +tristate "Eicon driver"
717 depends on PCI
718 help
719 Enable this option if you want the eicon driver as standalone
720@@ -26,16 +26,14 @@
721 here.
722
723 config ISDN_DRV_EICON_OLD
724 -tristate "Legacy Eicon driver"
725 +tristate "Legacy driver"
726 help
727 Say Y here to use your Eicon active ISDN card with ISDN4Linux
728 isdn module.
729
730-endchoice
731-
732 config ISDN_DRV_EICON_PCI
733 bool "Eicon PCI DIVA Server BRI/PRI/4BRI support"
734 -depends on ISDN_DRV_EICON_DIVAS!=y && ISDN_DRV_EICON_OLD && PCI
735 +depends on ISDN_DRV_EICON_OLD && PCI
736 help
737 Say Y here if you have an Eicon Diva Server (BRI/PRI/4BRI) ISDN
738 card. Please read <file:Documentation/isdn/README.eicon> for more
739@@ -43,7 +41,7 @@
740
741 config ISDN_DRV_EICON_ISA
742 bool "Eicon S,SX,SCOM,Quadro,S2M support"
743 -depends on ISDN_DRV_EICON_DIVAS!=y && ISDN_DRV_EICON_OLD
744 +depends on ISDN_DRV_EICON_OLD
745 help
746 Say Y here if you have an old-type Eicon active ISDN card. In order
747 to use this card, additional firmware is necessary, which has to be
748@@ -51,3 +49,5 @@
749 the latest isdn4k-utils package. Please read the file
750 <file:Documentation/isdn/README.eicon> for more information.
751
752+endchoice
753+
754 --- ./drivers/scsi/aic7xxx/Kconfig.org2002-10-16 17:09:15.000000000 +0200
755 +++ ./drivers/scsi/aic7xxx/Kconfig2002-10-16 17:12:17.000000000 +0200
756@@ -1,51 +1,5 @@
757-choice
758 -prompt "change me!"
759 -optional
760 -depends on SCSI
761-
762-config SCSI_AIC7XXX_OLD
763 -tristate "Old Adaptec AIC7xxx support"
764 ----help---
765 - WARNING This driver is an older aic7xxx driver and is no longer
766 - under active development. Adaptec, Inc. is writing a new driver to
767 - take the place of this one, and it is recommended that whenever
768 - possible, people should use the new Adaptec written driver instead
769 - of this one. This driver will eventually be phased out entirely.
770-
771 - This is support for the various aic7xxx based Adaptec SCSI
772 - controllers. These include the 274x EISA cards; 284x VLB cards;
773 - 2902, 2910, 293x, 294x, 394x, 3985 and several other PCI and
774 - motherboard based SCSI controllers from Adaptec. It does not support
775 - the AAA-13x RAID controllers from Adaptec, nor will it likely ever
776 - support them. It does not support the 2920 cards from Adaptec that
777 - use the Future Domain SCSI controller chip. For those cards, you
778 - need the "Future Domain 16xx SCSI support" driver.
779-
780 - In general, if the controller is based on an Adaptec SCSI controller
781 - chip from the aic777x series or the aic78xx series, this driver
782 - should work. The only exception is the 7810 which is specifically
783 - not supported (that's the RAID controller chip on the AAA-13x
784 - cards).
785-
786 - Note that the AHA2920 SCSI host adapter is *not* supported by this
787 - driver; choose "Future Domain 16xx SCSI support" instead if you have
788 - one of those.
789-
790 - Information on the configuration options for this controller can be
791 - found by checking the help file for each of the available
792 - configuration options. You should read
793 - <file:drivers/scsi/aic7xxx_old/README.aic7xxx> at a minimum before
794 - contacting the maintainer with any questions. The SCSI-HOWTO,
795 - available from <http://www.linuxdoc.org/docs.html#howto>, can also
796 - be of great help.
797-
798 - If you want to compile this driver as a module ( = code which can be
799 - inserted in and removed from the running kernel whenever you want),
800 - say M here and read <file:Documentation/modules.txt>. The module
801 - will be called aic7xxx_old.o.
802-
803 config SCSI_AIC7XXX
804 -tristate "Adaptec AIC7xxx support"
805 +tristate "New driver"
806 help
807 This driver supports all of Adaptec's PCI based SCSI controllers
808 (not the hardware RAID controllers though) as well as the aic7770
809@@ -54,11 +8,10 @@
810 intended to replace the previous aic7xxx driver maintained by Doug
811 Ledford since Doug is no longer maintaining that driver.
812
813-endchoice
814
815 config AIC7XXX_CMDS_PER_DEVICE
816 int "Maximum number of TCQ commands per device"
817 -depends on SCSI_AIC7XXX_OLD!=y && SCSI_AIC7XXX
818 +depends on SCSI_AIC7XXX
819 default "253"
820 ---help---
821 Specify the number of commands you would like to allocate per SCSI
822@@ -77,7 +30,7 @@
823
824 config AIC7XXX_RESET_DELAY_MS
825 int "Initial bus reset delay in milli-seconds"
826 -depends on SCSI_AIC7XXX_OLD!=y && SCSI_AIC7XXX
827 +depends on SCSI_AIC7XXX
828 default "15000"
829 help
830 The number of milliseconds to delay after an initial bus reset.
831@@ -88,7 +41,7 @@
832
833 config AIC7XXX_BUILD_FIRMWARE
834 bool "Build Adapter Firmware with Kernel Build"
835 -depends on SCSI_AIC7XXX_OLD!=y && SCSI_AIC7XXX
836 +depends on SCSI_AIC7XXX
837 help
838 This option should only be enabled if you are modifying the firmware
839 source to the aic7xxx driver and wish to have the generated firmware
840 --- ./drivers/scsi/Kconfig.org2002-10-16 17:09:15.000000000 +0200
841 +++ ./drivers/scsi/Kconfig2002-10-16 17:12:17.000000000 +0200
842@@ -311,8 +311,57 @@
843 tristate "Adaptec AACRAID support (EXPERIMENTAL)"
844 depends on EXPERIMENTAL && SCSI && PCI
845
846+choice
847 +prompt "Adaptec AIC7xxx support"
848 +optional
849 +depends on SCSI
850+
851 source "drivers/scsi/aic7xxx/Kconfig"
852
853+config SCSI_AIC7XXX_OLD
854 +tristate "Old driver"
855 +help
856 + WARNING This driver is an older aic7xxx driver and is no longer
857 + under active development. Adaptec, Inc. is writing a new driver to
858 + take the place of this one, and it is recommended that whenever
859 + possible, people should use the new Adaptec written driver instead
860 + of this one. This driver will eventually be phased out entirely.
861+
862 + This is support for the various aic7xxx based Adaptec SCSI
863 + controllers. These include the 274x EISA cards; 284x VLB cards;
864 + 2902, 2910, 293x, 294x, 394x, 3985 and several other PCI and
865 + motherboard based SCSI controllers from Adaptec. It does not support
866 + the AAA-13x RAID controllers from Adaptec, nor will it likely ever
867 + support them. It does not support the 2920 cards from Adaptec that
868 + use the Future Domain SCSI controller chip. For those cards, you
869 + need the "Future Domain 16xx SCSI support" driver.
870+
871 + In general, if the controller is based on an Adaptec SCSI controller
872 + chip from the aic777x series or the aic78xx series, this driver
873 + should work. The only exception is the 7810 which is specifically
874 + not supported (that's the RAID controller chip on the AAA-13x
875 + cards).
876+
877 + Note that the AHA2920 SCSI host adapter is *not* supported by this
878 + driver; choose "Future Domain 16xx SCSI support" instead if you have
879 + one of those.
880+
881 + Information on the configuration options for this controller can be
882 + found by checking the help file for each of the available
883 + configuration options. You should read
884 + <file:drivers/scsi/aic7xxx_old/README.aic7xxx> at a minimum before
885 + contacting the maintainer with any questions. The SCSI-HOWTO,
886 + available from <http://www.linuxdoc.org/docs.html#howto>, can also
887 + be of great help.
888+
889 + If you want to compile this driver as a module ( = code which can be
890 + inserted in and removed from the running kernel whenever you want),
891 + say M here and read <file:Documentation/modules.txt>. The module
892 + will be called aic7xxx_old.o.
893+
894+endchoice
895+
896+
897 # All the I2O code and drivers do not seem to be 64bit safe.
898 config SCSI_DPT_I2O
899 tristate "Adaptec I2O RAID support "
900 --- ./sound/oss/Kconfig.org2002-10-16 17:09:15.000000000 +0200
901 +++ ./sound/oss/Kconfig2002-10-16 17:12:17.000000000 +0200
902@@ -1023,12 +1023,12 @@
903 DSP 16 card.
904
905 choice
906 -prompt "change me!"
907 +prompt "Audio Excel DSP 16"
908 optional
909 depends on SOUND_AEDSP16
910
911 config AEDSP16_MSS
912 -bool "Audio Excel DSP 16 (MSS emulation)"
913 +bool "MSS emulation"
914 depends on SOUND_MSS
915 help
916 Answer Y if you want your audio card to emulate Microsoft Sound
917@@ -1036,7 +1036,7 @@
918 and say N to "Audio Excel DSP 16 (SBPro emulation)".
919
920 config AEDSP16_SBPRO
921 -bool "Audio Excel DSP 16 (SBPro emulation)"
922 +bool "SBPro emulation"
923 depends on SOUND_SB
924 help
925 Answer Y if you want your audio card to emulate Sound Blaster Pro.