]>
Commit | Line | Data |
---|---|---|
b6b47fac JR |
1 | --- lids-1.0.8-2.4.4/lids-1.0.8-2.4.4.patch~ Mon May 21 09:38:10 2001 |
2 | +++ lids-1.0.8-2.4.4/lids-1.0.8-2.4.4.patch Sat May 26 16:14:32 2001 | |
3 | @@ -310,278 +310,6 @@ | |
4 | bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ | |
5 | endmenu | |
6 | +source kernel/Config.in | |
7 | -diff -N -r -u linux-2.4.4/arch/mips64/config.in~ linux/arch/mips64/config.in~ | |
8 | ---- linux-2.4.4/arch/mips64/config.in~ Thu Jan 1 08:00:00 1970 | |
9 | -+++ linux/arch/mips64/config.in~ Mon May 21 10:42:14 2001 | |
10 | -@@ -0,0 +1,268 @@ | |
11 | -+# | |
12 | -+# For a description of the syntax of this configuration file, | |
13 | -+# see Documentation/kbuild/config-language.txt. | |
14 | -+# | |
15 | -+mainmenu_name "Linux Kernel Configuration" | |
16 | -+ | |
17 | -+mainmenu_option next_comment | |
18 | -+comment 'Code maturity level options' | |
19 | -+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL | |
20 | -+endmenu | |
21 | -+ | |
22 | -+mainmenu_option next_comment | |
23 | -+comment 'Machine selection' | |
24 | -+bool 'Support for SGI IP22' CONFIG_SGI_IP22 | |
25 | -+bool 'Support for SGI IP27' CONFIG_SGI_IP27 | |
26 | -+if [ "$CONFIG_SGI_IP27" = "y" ]; then | |
27 | -+ bool ' IP27 N-Mode' CONFIG_SGI_SN0_N_MODE | |
28 | -+ bool ' Discontiguous Memory Support' CONFIG_DISCONTIGMEM | |
29 | -+ bool ' NUMA support' CONFIG_NUMA | |
30 | -+ bool ' Mapped kernel support' CONFIG_MAPPED_KERNEL | |
31 | -+ bool ' Kernel text replication support' CONFIG_REPLICATE_KTEXT | |
32 | -+ bool ' Exception handler replication support' CONFIG_REPLICATE_EXHANDLERS | |
33 | -+ bool ' Multi-Processing support' CONFIG_SMP | |
34 | -+ #bool ' IP27 XXL' CONFIG_SGI_SN0_XXL | |
35 | -+fi | |
36 | -+endmenu | |
37 | -+ | |
38 | -+# | |
39 | -+# Select some configuration options automatically based on user selections | |
40 | -+# | |
41 | -+unset CONFIG_ARC32 | |
42 | -+unset CONFIG_ARC64 | |
43 | -+unset CONFIG_BINFMT_ELF32 | |
44 | -+unset CONFIG_BOARD_SCACHE | |
45 | -+unset CONFIG_BOOT_ELF32 | |
46 | -+unset CONFIG_BOOT_ELF64 | |
47 | -+unset CONFIG_COHERENT_IO | |
48 | -+unset CONFIG_ISA | |
49 | -+unset CONFIG_PCI | |
50 | -+ | |
51 | -+if [ "$CONFIG_SGI_IP22" = "y" ]; then | |
52 | -+ define_bool CONFIG_BOOT_ELF32 y | |
53 | -+ define_bool CONFIG_ARC32 y | |
54 | -+ define_bool CONFIG_BOARD_SCACHE y | |
55 | -+ define_bool CONFIG_ARC_MEMORY y | |
56 | -+ define_bool CONFIG_SGI y | |
57 | -+fi | |
58 | -+ | |
59 | -+if [ "$CONFIG_SGI_IP27" = "y" ]; then | |
60 | -+ define_bool CONFIG_BOOT_ELF64 y | |
61 | -+ define_bool CONFIG_ARC64 y | |
62 | -+ define_bool CONFIG_COHERENT_IO y | |
63 | -+ define_bool CONFIG_PCI y | |
64 | -+ define_bool CONFIG_QL_ISP_A64 y | |
65 | -+fi | |
66 | -+ | |
67 | -+if [ "$CONFIG_ISA" != "y" ]; then | |
68 | -+ define_bool CONFIG_ISA n | |
69 | -+ define_bool CONFIG_EISA n | |
70 | -+else | |
71 | -+ define_bool CONFIG_EISA y | |
72 | -+fi | |
73 | -+ | |
74 | -+if [ "$CONFIG_PCI" != "y" ]; then | |
75 | -+ define_bool CONFIG_PCI n | |
76 | -+fi | |
77 | -+ | |
78 | -+define_bool CONFIG_MCA n | |
79 | -+define_bool CONFIG_SBUS n | |
80 | -+ | |
81 | -+mainmenu_option next_comment | |
82 | -+comment 'CPU selection' | |
83 | -+ | |
84 | -+choice 'CPU type' \ | |
85 | -+ "R4300 CONFIG_CPU_R4300 \ | |
86 | -+ R4x00 CONFIG_CPU_R4X00 \ | |
87 | -+ R5000 CONFIG_CPU_R5000 \ | |
88 | -+ R52x0 CONFIG_CPU_NEVADA \ | |
89 | -+ R8000 CONFIG_CPU_R8000 \ | |
90 | -+ R10000 CONFIG_CPU_R10000" R4x00 | |
91 | -+endmenu | |
92 | -+ | |
93 | -+mainmenu_option next_comment | |
94 | -+comment 'General setup' | |
95 | -+ | |
96 | -+if [ "$CONFIG_CPU_R10000" = "y" ]; then | |
97 | -+ bool 'Support for large 64-bit configurations' CONFIG_MIPS_INSANE_LARGE | |
98 | -+fi | |
99 | -+bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN | |
100 | -+ | |
101 | -+bool 'Networking support' CONFIG_NET | |
102 | -+ | |
103 | -+source drivers/pci/Config.in | |
104 | -+ | |
105 | -+bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG | |
106 | -+ | |
107 | -+if [ "$CONFIG_HOTPLUG" = "y" ] ; then | |
108 | -+ source drivers/pcmcia/Config.in | |
109 | -+else | |
110 | -+ define_bool CONFIG_PCMCIA n | |
111 | -+fi | |
112 | -+ | |
113 | -+bool 'System V IPC' CONFIG_SYSVIPC | |
114 | -+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT | |
115 | -+bool 'Sysctl support' CONFIG_SYSCTL | |
116 | -+tristate 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF | |
117 | -+bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT | |
118 | -+if [ "$CONFIG_MIPS32_COMPAT" = "y" ]; then | |
119 | -+ define_bool CONFIG_BINFMT_ELF32 y | |
120 | -+fi | |
121 | -+tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC | |
122 | -+ | |
123 | -+endmenu | |
124 | -+ | |
125 | -+mainmenu_option next_comment | |
126 | -+comment 'Loadable module support' | |
127 | -+bool 'Enable loadable module support' CONFIG_MODULES | |
128 | -+if [ "$CONFIG_MODULES" = "y" ]; then | |
129 | -+ bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS | |
130 | -+ bool 'Kernel module loader' CONFIG_KMOD | |
131 | -+fi | |
132 | -+ | |
133 | -+source drivers/pci/Config.in | |
134 | -+ | |
135 | -+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
136 | -+ bool 'Support for frame buffer devices (EXPERIMENTAL)' CONFIG_FB | |
137 | -+fi | |
138 | -+ | |
139 | -+endmenu | |
140 | -+ | |
141 | -+source drivers/mtd/Config.in | |
142 | -+ | |
143 | -+source drivers/block/Config.in | |
144 | -+ | |
145 | -+source drivers/md/Config.in | |
146 | -+ | |
147 | -+if [ "$CONFIG_NET" = "y" ]; then | |
148 | -+ source net/Config.in | |
149 | -+fi | |
150 | -+ | |
151 | -+source drivers/telephony/Config.in | |
152 | -+ | |
153 | -+mainmenu_option next_comment | |
154 | -+comment 'ATA/IDE/MFM/RLL support' | |
155 | -+ | |
156 | -+tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE | |
157 | -+ | |
158 | -+if [ "$CONFIG_IDE" != "n" ]; then | |
159 | -+ source drivers/ide/Config.in | |
160 | -+else | |
161 | -+ define_bool CONFIG_BLK_DEV_IDE_MODES n | |
162 | -+ define_bool CONFIG_BLK_DEV_HD n | |
163 | -+fi | |
164 | -+endmenu | |
165 | -+ | |
166 | -+mainmenu_option next_comment | |
167 | -+comment 'SCSI support' | |
168 | -+ | |
169 | -+tristate 'SCSI support' CONFIG_SCSI | |
170 | -+ | |
171 | -+if [ "$CONFIG_SCSI" != "n" ]; then | |
172 | -+ source drivers/scsi/Config.in | |
173 | -+fi | |
174 | -+endmenu | |
175 | -+ | |
176 | -+source drivers/i2o/Config.in | |
177 | -+ | |
178 | -+if [ "$CONFIG_NET" = "y" ]; then | |
179 | -+ mainmenu_option next_comment | |
180 | -+ comment 'Network device support' | |
181 | -+ | |
182 | -+ bool 'Network device support' CONFIG_NETDEVICES | |
183 | -+ if [ "$CONFIG_NETDEVICES" = "y" ]; then | |
184 | -+ source drivers/net/Config.in | |
185 | -+ if [ "$CONFIG_SGI_IP22" = "y" ]; then | |
186 | -+ bool 'SGI Seeq ethernet controller support' CONFIG_SGISEEQ | |
187 | -+ fi | |
188 | -+ if [ "$CONFIG_DECSTATION" = "y" ]; then | |
189 | -+ bool 'DEC LANCE ethernet controller support' CONFIG_DECLANCE | |
190 | -+ fi | |
191 | -+ if [ "$CONFIG_BAGET_MIPS" = "y" ]; then | |
192 | -+ tristate 'Baget AMD LANCE support' CONFIG_BAGETLANCE | |
193 | -+ tristate 'Baget Backplane Shared Memory support' CONFIG_BAGETBSM | |
194 | -+ fi | |
195 | -+ if [ "$CONFIG_ATM" = "y" ]; then | |
196 | -+ source drivers/atm/Config.in | |
197 | -+ fi | |
198 | -+ fi | |
199 | -+ endmenu | |
200 | -+fi | |
201 | -+ | |
202 | -+source net/ax25/Config.in | |
203 | -+ | |
204 | -+source net/irda/Config.in | |
205 | -+ | |
206 | -+mainmenu_option next_comment | |
207 | -+comment 'ISDN subsystem' | |
208 | -+ | |
209 | -+if [ "$CONFIG_NET" != "n" ]; then | |
210 | -+ tristate 'ISDN support' CONFIG_ISDN | |
211 | -+ if [ "$CONFIG_ISDN" != "n" ]; then | |
212 | -+ source drivers/isdn/Config.in | |
213 | -+ fi | |
214 | -+fi | |
215 | -+endmenu | |
216 | -+ | |
217 | -+mainmenu_option next_comment | |
218 | -+comment 'Old CD-ROM drivers (not SCSI, not IDE)' | |
219 | -+ | |
220 | -+bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI | |
221 | -+if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then | |
222 | -+ source drivers/cdrom/Config.in | |
223 | -+fi | |
224 | -+endmenu | |
225 | -+ | |
226 | -+source drivers/char/Config.in | |
227 | -+ | |
228 | -+#source drivers/misc/Config.in | |
229 | -+ | |
230 | -+source drivers/media/Config.in | |
231 | -+ | |
232 | -+source fs/Config.in | |
233 | -+ | |
234 | -+if [ "$CONFIG_VT" = "y" ]; then | |
235 | -+ mainmenu_option next_comment | |
236 | -+ comment 'Console drivers' | |
237 | -+ if [ "$CONFIG_SGI_IP22" = "y" ]; then | |
238 | -+ tristate 'SGI Newport Console support' CONFIG_SGI_NEWPORT_CONSOLE | |
239 | -+ if [ "$CONFIG_SGI_NEWPORT_CONSOLE" != "y" ]; then | |
240 | -+ define_bool CONFIG_DUMMY_CONSOLE y | |
241 | -+ else | |
242 | -+ define_bool CONFIG_FONT_8x16 y | |
243 | -+ fi | |
244 | -+ fi | |
245 | -+ endmenu | |
246 | -+fi | |
247 | -+ | |
248 | -+if [ "$CONFIG_PROC_FS" = "y" ]; then | |
249 | -+ define_bool CONFIG_KCORE_ELF y | |
250 | -+fi | |
251 | -+ | |
252 | -+mainmenu_option next_comment | |
253 | -+comment 'Sound' | |
254 | -+ | |
255 | -+tristate 'Sound card support' CONFIG_SOUND | |
256 | -+if [ "$CONFIG_SOUND" != "n" ]; then | |
257 | -+ source drivers/sound/Config.in | |
258 | -+fi | |
259 | -+endmenu | |
260 | -+ | |
261 | -+if [ "$CONFIG_SGI_IP22" = "y" ]; then | |
262 | -+ source drivers/sgi/Config.in | |
263 | -+fi | |
264 | -+ | |
265 | -+source drivers/usb/Config.in | |
266 | -+source drivers/input/Config.in | |
267 | -+ | |
268 | -+mainmenu_option next_comment | |
269 | -+comment 'Kernel hacking' | |
270 | -+ | |
271 | -+#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC | |
272 | -+bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE | |
273 | -+if [ "$CONFIG_MODULES" = "y" ]; then | |
274 | -+ bool ' Build fp execption handler module' CONFIG_MIPS_FPE_MODULE | |
275 | -+fi | |
276 | -+bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG | |
277 | -+bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ | |
278 | -+endmenu | |
279 | diff -N -r -u linux-2.4.4/arch/parisc/config.in linux/arch/parisc/config.in | |
280 | --- linux-2.4.4/arch/parisc/config.in Mon May 21 15:24:43 2001 | |
281 | +++ linux/arch/parisc/config.in Mon May 21 10:42:14 2001 | |
282 | @@ -607,80 +335,6 @@ | |
283 | endmenu | |
284 | ||
285 | +source kernel/Config.in | |
286 | -diff -N -r -u linux-2.4.4/arch/s390/config.in~ linux/arch/s390/config.in~ | |
287 | ---- linux-2.4.4/arch/s390/config.in~ Thu Jan 1 08:00:00 1970 | |
288 | -+++ linux/arch/s390/config.in~ Mon May 21 10:42:14 2001 | |
289 | -@@ -0,0 +1,70 @@ | |
290 | -+# | |
291 | -+# For a description of the syntax of this configuration file, | |
292 | -+# see Documentation/kbuild/config-language.txt. | |
293 | -+# | |
294 | -+ | |
295 | -+define_bool CONFIG_ISA n | |
296 | -+define_bool CONFIG_EISA n | |
297 | -+define_bool CONFIG_MCA n | |
298 | -+define_bool CONFIG_UID16 y | |
299 | -+ | |
300 | -+mainmenu_name "Linux Kernel Configuration" | |
301 | -+define_bool CONFIG_ARCH_S390 y | |
302 | -+ | |
303 | -+mainmenu_option next_comment | |
304 | -+comment 'Code maturity level options' | |
305 | -+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL | |
306 | -+endmenu | |
307 | -+ | |
308 | -+mainmenu_option next_comment | |
309 | -+comment 'Loadable module support' | |
310 | -+bool 'Enable loadable module support' CONFIG_MODULES | |
311 | -+if [ "$CONFIG_MODULES" = "y" ]; then | |
312 | -+ bool ' Set version information on all module symbols' CONFIG_MODVERSIONS | |
313 | -+ bool ' Kernel module loader' CONFIG_KMOD | |
314 | -+fi | |
315 | -+endmenu | |
316 | -+ | |
317 | -+mainmenu_option next_comment | |
318 | -+comment 'Processor type and features' | |
319 | -+bool 'Symmetric multi-processing support' CONFIG_SMP | |
320 | -+bool 'IEEE FPU emulation' CONFIG_IEEEFPU_EMULATION | |
321 | -+endmenu | |
322 | -+ | |
323 | -+mainmenu_option next_comment | |
324 | -+comment 'General setup' | |
325 | -+bool 'Fast IRQ handling' CONFIG_FAST_IRQ | |
326 | -+bool 'Builtin IPL record support' CONFIG_IPL | |
327 | -+if [ "$CONFIG_IPL" = "y" ]; then | |
328 | -+ choice 'IPL method generated into head.S' \ | |
329 | -+ "tape CONFIG_IPL_TAPE \ | |
330 | -+ vm_reader CONFIG_IPL_VM" tape | |
331 | -+fi | |
332 | -+bool 'Networking support' CONFIG_NET | |
333 | -+bool 'System V IPC' CONFIG_SYSVIPC | |
334 | -+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT | |
335 | -+bool 'Sysctl support' CONFIG_SYSCTL | |
336 | -+define CONFIG_KCORE ELF | |
337 | -+tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF | |
338 | -+tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC | |
339 | -+bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG | |
340 | -+endmenu | |
341 | -+ | |
342 | -+source drivers/s390/Config.in | |
343 | -+ | |
344 | -+if [ "$CONFIG_NET" = "y" ]; then | |
345 | -+ source net/Config.in | |
346 | -+fi | |
347 | -+ | |
348 | -+source fs/Config.in | |
349 | -+ | |
350 | -+mainmenu_option next_comment | |
351 | -+comment 'Kernel hacking' | |
352 | -+ | |
353 | -+#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC | |
354 | -+if [ "$CONFIG_CTC" = "y" ]; then | |
355 | -+ bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG | |
356 | -+fi | |
357 | -+# this does not work. bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ | |
358 | -+endmenu | |
359 | -+ | |
360 | diff -N -r -u linux-2.4.4/arch/sh/config.in linux/arch/sh/config.in | |
361 | --- linux-2.4.4/arch/sh/config.in Mon May 21 15:24:44 2001 | |
362 | +++ linux/arch/sh/config.in Mon May 21 10:42:14 2001 | |
363 | @@ -706,351 +360,6 @@ | |
364 | endmenu | |
365 | + | |
366 | +source kernel/Config.in | |
367 | -diff -N -r -u linux-2.4.4/arch/sparc64/config.in~ linux/arch/sparc64/config.in~ | |
368 | ---- linux-2.4.4/arch/sparc64/config.in~ Thu Jan 1 08:00:00 1970 | |
369 | -+++ linux/arch/sparc64/config.in~ Mon May 21 10:42:14 2001 | |
370 | -@@ -0,0 +1,341 @@ | |
371 | -+# $Id$ | |
372 | -+# For a description of the syntax of this configuration file, | |
373 | -+# see the Configure script. | |
374 | -+# | |
375 | -+mainmenu_name "Linux/UltraSPARC Kernel Configuration" | |
376 | -+ | |
377 | -+mainmenu_option next_comment | |
378 | -+comment 'Code maturity level options' | |
379 | -+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL | |
380 | -+endmenu | |
381 | -+ | |
382 | -+mainmenu_option next_comment | |
383 | -+comment 'Loadable module support' | |
384 | -+bool 'Enable loadable module support' CONFIG_MODULES | |
385 | -+if [ "$CONFIG_MODULES" = "y" ]; then | |
386 | -+ bool ' Set version information on all symbols for modules' CONFIG_MODVERSIONS | |
387 | -+ bool ' Kernel module loader' CONFIG_KMOD | |
388 | -+fi | |
389 | -+endmenu | |
390 | -+ | |
391 | -+mainmenu_option next_comment | |
392 | -+comment 'General setup' | |
393 | -+ | |
394 | -+define_bool CONFIG_VT y | |
395 | -+define_bool CONFIG_VT_CONSOLE y | |
396 | -+ | |
397 | -+bool 'Symmetric multi-processing support' CONFIG_SMP | |
398 | -+ | |
399 | -+# Identify this as a Sparc64 build | |
400 | -+define_bool CONFIG_SPARC64 y | |
401 | -+ | |
402 | -+# Global things across all Sun machines. | |
403 | -+define_bool CONFIG_HAVE_DEC_LOCK y | |
404 | -+define_bool CONFIG_ISA n | |
405 | -+define_bool CONFIG_EISA n | |
406 | -+define_bool CONFIG_MCA n | |
407 | -+define_bool CONFIG_PCMCIA n | |
408 | -+define_bool CONFIG_SBUS y | |
409 | -+define_bool CONFIG_SBUSCHAR y | |
410 | -+define_bool CONFIG_BUSMOUSE y | |
411 | -+define_bool CONFIG_SUN_MOUSE y | |
412 | -+define_bool CONFIG_SERIAL y | |
413 | -+define_bool CONFIG_SUN_SERIAL y | |
414 | -+define_bool CONFIG_SERIAL_CONSOLE y | |
415 | -+define_bool CONFIG_SUN_KEYBOARD y | |
416 | -+define_bool CONFIG_SUN_CONSOLE y | |
417 | -+define_bool CONFIG_SUN_AUXIO y | |
418 | -+define_bool CONFIG_SUN_IO y | |
419 | -+bool 'PCI support' CONFIG_PCI | |
420 | -+source drivers/pci/Config.in | |
421 | -+ | |
422 | -+tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS | |
423 | -+bool 'Networking support' CONFIG_NET | |
424 | -+bool 'System V IPC' CONFIG_SYSVIPC | |
425 | -+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT | |
426 | -+bool 'Sysctl support' CONFIG_SYSCTL | |
427 | -+if [ "$CONFIG_PROC_FS" = "y" ]; then | |
428 | -+ define_bool CONFIG_KCORE_ELF y | |
429 | -+fi | |
430 | -+bool 'Kernel support for Linux/Sparc 32bit binary compatibility' CONFIG_SPARC32_COMPAT | |
431 | -+if [ "$CONFIG_SPARC32_COMPAT" != "n" ]; then | |
432 | -+ tristate ' Kernel support for 32-bit ELF binaries' CONFIG_BINFMT_ELF32 | |
433 | -+ bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 | |
434 | -+fi | |
435 | -+tristate 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF | |
436 | -+tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC | |
437 | -+bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL | |
438 | -+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
439 | -+ tristate 'Solaris binary emulation (EXPERIMENTAL)' CONFIG_SOLARIS_EMUL | |
440 | -+fi | |
441 | -+source drivers/parport/Config.in | |
442 | -+dep_tristate ' Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT | |
443 | -+if [ "$CONFIG_PCI" = "y" ]; then | |
444 | -+ tristate 'SUNW, envctrl support' CONFIG_ENVCTRL | |
445 | -+ tristate '7-Segment Display support' CONFIG_DISPLAY7SEG | |
446 | -+ tristate 'CP1XXX Hardware Watchdog support' CONFIG_WATCHDOG_CP1XXX | |
447 | -+fi | |
448 | -+endmenu | |
449 | -+ | |
450 | -+mainmenu_option next_comment | |
451 | -+comment 'Console drivers' | |
452 | -+bool 'PROM console' CONFIG_PROM_CONSOLE | |
453 | -+bool 'Support Frame buffer devices' CONFIG_FB | |
454 | -+source drivers/video/Config.in | |
455 | -+endmenu | |
456 | -+ | |
457 | -+source drivers/sbus/char/Config.in | |
458 | -+source drivers/sbus/audio/Config.in | |
459 | -+source drivers/mtd/Config.in | |
460 | -+mainmenu_option next_comment | |
461 | -+comment 'Block devices' | |
462 | -+ | |
463 | -+bool 'Normal floppy disk support' CONFIG_BLK_DEV_FD | |
464 | -+ | |
465 | -+tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP | |
466 | -+dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET | |
467 | -+ | |
468 | -+source drivers/md/Config.in | |
469 | -+ | |
470 | -+tristate 'RAM disk support' CONFIG_BLK_DEV_RAM | |
471 | -+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then | |
472 | -+ int ' Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096 | |
473 | -+fi | |
474 | -+dep_bool ' Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM | |
475 | -+ | |
476 | -+endmenu | |
477 | -+ | |
478 | -+if [ "$CONFIG_NET" = "y" ]; then | |
479 | -+ source net/Config.in | |
480 | -+fi | |
481 | -+ | |
482 | -+mainmenu_option next_comment | |
483 | -+comment 'ATA/IDE/MFM/RLL support' | |
484 | -+ | |
485 | -+tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE | |
486 | -+ | |
487 | -+if [ "$CONFIG_IDE" != "n" ]; then | |
488 | -+ source drivers/ide/Config.in | |
489 | -+else | |
490 | -+ define_bool CONFIG_BLK_DEV_IDE_MODES n | |
491 | -+ define_bool CONFIG_BLK_DEV_HD n | |
492 | -+fi | |
493 | -+endmenu | |
494 | -+ | |
495 | -+mainmenu_option next_comment | |
496 | -+comment 'SCSI support' | |
497 | -+ | |
498 | -+tristate 'SCSI support' CONFIG_SCSI | |
499 | -+ | |
500 | -+if [ "$CONFIG_SCSI" != "n" ]; then | |
501 | -+ comment 'SCSI support type (disk, tape, CDrom)' | |
502 | -+ | |
503 | -+ dep_tristate ' SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI | |
504 | -+ | |
505 | -+ if [ "$CONFIG_BLK_DEV_SD" != "n" ]; then | |
506 | -+ int 'Maximum number of SCSI disks that can be loaded as modules' CONFIG_SD_EXTRA_DEVS 40 | |
507 | -+ fi | |
508 | -+ | |
509 | -+ dep_tristate ' SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI | |
510 | -+ | |
511 | -+ if [ "$CONFIG_BLK_DEV_ST" != "n" ]; then | |
512 | -+ int 'Maximum number of SCSI tapes that can be loaded as modules' CONFIG_ST_EXTRA_DEVS 2 | |
513 | -+ fi | |
514 | -+ | |
515 | -+ dep_tristate ' SCSI CDROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI | |
516 | -+ | |
517 | -+ if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then | |
518 | -+ bool ' Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR | |
519 | -+ int 'Maximum number of CDROM devices that can be loaded as modules' CONFIG_SR_EXTRA_DEVS 2 | |
520 | -+ fi | |
521 | -+ | |
522 | -+ dep_tristate ' SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI | |
523 | -+ | |
524 | -+ comment 'Some SCSI devices (e.g. CD jukebox) support multiple LUNs' | |
525 | -+ | |
526 | -+ bool ' Probe all LUNs on each SCSI device' CONFIG_SCSI_MULTI_LUN | |
527 | -+ | |
528 | -+ bool ' Verbose SCSI error reporting (kernel size +=12K)' CONFIG_SCSI_CONSTANTS | |
529 | -+ bool ' SCSI logging facility' CONFIG_SCSI_LOGGING | |
530 | -+ | |
531 | -+ mainmenu_option next_comment | |
532 | -+ comment 'SCSI low-level drivers' | |
533 | -+ | |
534 | -+ dep_tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI | |
535 | -+ dep_tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI | |
536 | -+ | |
537 | -+ if [ "$CONFIG_PCI" != "n" ]; then | |
538 | -+ dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI | |
539 | -+ if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then | |
540 | -+ bool ' Enable tagged command queueing (TCQ) by default' CONFIG_AIC7XXX_TAGGED_QUEUEING | |
541 | -+ int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 8 | |
542 | -+ bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS | |
543 | -+ int ' Delay in seconds after SCSI bus reset' CONFIG_AIC7XXX_RESET_DELAY 5 | |
544 | -+ fi | |
545 | -+ dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI | |
546 | -+ dep_tristate 'SYM53C8XX SCSI support' CONFIG_SCSI_SYM53C8XX $CONFIG_SCSI | |
547 | -+ if [ "$CONFIG_SCSI_NCR53C8XX" != "n" -o "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then | |
548 | -+ int 'default tagged command queue depth' CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS 8 | |
549 | -+ int 'maximum number of queued commands' CONFIG_SCSI_NCR53C8XX_MAX_TAGS 32 | |
550 | -+ int 'synchronous transfers frequency in MHz' CONFIG_SCSI_NCR53C8XX_SYNC 10 | |
551 | -+ bool ' enable profiling' CONFIG_SCSI_NCR53C8XX_PROFILE | |
552 | -+ if [ "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then | |
553 | -+ bool ' include support for the NCR PQS/PDS SCSI card' CONFIG_SCSI_NCR53C8XX_PQS_PDS | |
554 | -+ fi | |
555 | -+ if [ "$CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS" = "0" ]; then | |
556 | -+ bool ' not allow targets to disconnect' CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT | |
557 | -+ fi | |
558 | -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
559 | -+ bool ' assume boards are SYMBIOS compatible (EXPERIMENTAL)' CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT | |
560 | -+ fi | |
561 | -+ fi | |
562 | -+ dep_tristate 'Qlogic ISP SCSI support' CONFIG_SCSI_QLOGIC_ISP $CONFIG_SCSI | |
563 | -+ dep_tristate 'Qlogic ISP FC SCSI support' CONFIG_SCSI_QLOGIC_FC $CONFIG_SCSI | |
564 | -+ fi | |
565 | -+ | |
566 | -+ endmenu | |
567 | -+fi | |
568 | -+endmenu | |
569 | -+ | |
570 | -+source drivers/message/fusion/Config.in | |
571 | -+ | |
572 | -+source drivers/fc4/Config.in | |
573 | -+ | |
574 | -+if [ "$CONFIG_PCI" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
575 | -+ mainmenu_option next_comment | |
576 | -+ comment 'IEEE 1394 (FireWire) support' | |
577 | -+ | |
578 | -+ dep_tristate 'IEEE 1394 (FireWire) support (EXPERIMENTAL)' CONFIG_IEEE1394 $CONFIG_PCI | |
579 | -+ | |
580 | -+ if [ "$CONFIG_IEEE1394" != "n" ]; then | |
581 | -+ dep_tristate 'Texas Instruments PCILynx support' CONFIG_IEEE1394_PCILYNX $CONFIG_IEEE1394 | |
582 | -+ if [ "$CONFIG_IEEE1394_PCILYNX" != "n" ]; then | |
583 | -+ bool ' Use PCILynx local RAM' CONFIG_IEEE1394_PCILYNX_LOCALRAM | |
584 | -+ bool ' Support for non-IEEE1394 local ports' CONFIG_IEEE1394_PCILYNX_PORTS | |
585 | -+ fi | |
586 | -+ | |
587 | -+ dep_tristate 'OHCI (Open Host Controller Interface) support' CONFIG_IEEE1394_OHCI1394 $CONFIG_IEEE1394 | |
588 | -+ | |
589 | -+ dep_tristate 'Raw IEEE1394 I/O support' CONFIG_IEEE1394_RAWIO $CONFIG_IEEE1394 | |
590 | -+ | |
591 | -+ bool 'Excessive debugging output' CONFIG_IEEE1394_VERBOSEDEBUG | |
592 | -+ fi | |
593 | -+ endmenu | |
594 | -+fi | |
595 | -+ | |
596 | -+if [ "$CONFIG_NET" = "y" ]; then | |
597 | -+ mainmenu_option next_comment | |
598 | -+ comment 'Network device support' | |
599 | -+ | |
600 | -+ bool 'Network device support' CONFIG_NETDEVICES | |
601 | -+ if [ "$CONFIG_NETDEVICES" = "y" ]; then | |
602 | -+ tristate ' Dummy net driver support' CONFIG_DUMMY | |
603 | -+ tristate ' Bonding driver support' CONFIG_BONDING | |
604 | -+ tristate ' Universal TUN/TAP device driver support' CONFIG_TUN | |
605 | -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
606 | -+ if [ "$CONFIG_NETLINK" = "y" ]; then | |
607 | -+ tristate ' Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP | |
608 | -+ fi | |
609 | -+ fi | |
610 | -+ tristate ' PPP (point-to-point) support' CONFIG_PPP | |
611 | -+ if [ ! "$CONFIG_PPP" = "n" ]; then | |
612 | -+ dep_tristate ' PPP support for async serial ports' CONFIG_PPP_ASYNC $CONFIG_PPP | |
613 | -+ dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP | |
614 | -+ dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP | |
615 | -+ dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP m | |
616 | -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
617 | -+ dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP | |
618 | -+ fi | |
619 | -+ fi | |
620 | -+ tristate ' SLIP (serial line) support' CONFIG_SLIP | |
621 | -+ if [ "$CONFIG_SLIP" != "n" ]; then | |
622 | -+ bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED | |
623 | -+ bool ' Keepalive and linefill' CONFIG_SLIP_SMART | |
624 | -+ bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6 | |
625 | -+ fi | |
626 | -+ | |
627 | -+ mainmenu_option next_comment | |
628 | -+ comment 'Ethernet (10 or 100Mbit)' | |
629 | -+ | |
630 | -+ tristate 'Sun LANCE support' CONFIG_SUNLANCE | |
631 | -+ tristate 'Sun Happy Meal 10/100baseT support' CONFIG_HAPPYMEAL | |
632 | -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | |
633 | -+ tristate 'Sun BigMAC 10/100baseT support (EXPERIMENTAL)' CONFIG_SUNBMAC | |
634 | -+ fi | |
635 | -+ tristate ' Sun QuadEthernet support' CONFIG_SUNQE | |
636 | -+ if [ "$CONFIG_PCI" = "y" ]; then | |
637 | -+ tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5 | |
638 | -+ tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP | |
639 | -+ tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX | |
640 | -+ tristate 'RealTek RTL-8139 support' CONFIG_8139TOO | |
641 | -+ tristate 'PCI NE2000 support' CONFIG_NE2K_PCI | |
642 | -+ tristate 'VIA Rhine support' CONFIG_VIA_RHINE | |
643 | -+ tristate 'EtherExpressPro/100 support' CONFIG_EEPRO100 | |
644 | -+ tristate 'Adaptec Starfire support' CONFIG_ADAPTEC_STARFIRE | |
645 | -+ fi | |
646 | -+ endmenu | |
647 | -+ | |
648 | -+ mainmenu_option next_comment | |
649 | -+ comment 'Ethernet (1000 Mbit)' | |
650 | -+ | |
651 | -+ if [ "$CONFIG_PCI" = "y" ]; then | |
652 | -+ tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC | |
653 | -+ if [ "$CONFIG_ACENIC" != "n" ]; then | |
654 | -+ bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I | |
655 | -+ fi | |
656 | -+ tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN | |
657 | -+ fi | |
658 | -+ tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS | |
659 | -+ endmenu | |
660 | -+ | |
661 | -+ bool 'FDDI driver support' CONFIG_FDDI | |
662 | -+ if [ "$CONFIG_FDDI" = "y" ]; then | |
663 | -+ tristate ' SysKonnect FDDI PCI support' CONFIG_SKFP | |
664 | -+ fi | |
665 | -+ | |
666 | -+ if [ "$CONFIG_ATM" = "y" ]; then | |
667 | -+ source drivers/atm/Config.in | |
668 | -+ fi | |
669 | -+ fi | |
670 | -+ endmenu | |
671 | -+fi | |
672 | -+ | |
673 | -+# This one must be before the filesystem configs. -DaveM | |
674 | -+mainmenu_option next_comment | |
675 | -+comment 'Unix 98 PTY support' | |
676 | -+bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS | |
677 | -+if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then | |
678 | -+ int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256 | |
679 | -+fi | |
680 | -+endmenu | |
681 | -+ | |
682 | -+mainmenu_option next_comment | |
683 | -+comment 'Video For Linux' | |
684 | -+tristate 'Video For Linux' CONFIG_VIDEO_DEV | |
685 | -+if [ "$CONFIG_VIDEO_DEV" != "n" ]; then | |
686 | -+ if [ "$CONFIG_PCI" != "n" ]; then | |
687 | -+ dep_tristate ' BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV | |
688 | -+ fi | |
689 | -+fi | |
690 | -+endmenu | |
691 | -+ | |
692 | -+mainmenu_option next_comment | |
693 | -+comment 'XFree86 DRI support' | |
694 | -+bool 'Direct Rendering Manager (XFree86 DRI support)' CONFIG_DRM | |
695 | -+dep_tristate ' Creator/Creator3D' CONFIG_DRM_FFB $CONFIG_DRM | |
696 | -+endmenu | |
697 | -+ | |
698 | -+source fs/Config.in | |
699 | -+ | |
700 | -+mainmenu_option next_comment | |
701 | -+comment 'Watchdog' | |
702 | -+ | |
703 | -+tristate 'Software watchdog' CONFIG_SOFT_WATCHDOG | |
704 | -+endmenu | |
705 | -+ | |
706 | -+mainmenu_option next_comment | |
707 | -+comment 'Kernel hacking' | |
708 | -+ | |
709 | -+bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ | |
710 | -+#bool 'ECache flush trap support at ta 0x72' CONFIG_EC_FLUSH_TRAP | |
711 | -+endmenu | |
712 | diff -N -r -u linux-2.4.4/fs/buffer.c linux/fs/buffer.c | |
713 | --- linux-2.4.4/fs/buffer.c Mon May 21 15:25:23 2001 | |
714 | +++ linux/fs/buffer.c Mon May 21 10:42:14 2001 | |
2e066897 JR |
715 | @@ -1768,9 +1768,9 @@ |
716 | --- linux-2.4.4/kernel/Makefile Mon May 21 10:55:58 2001 | |
717 | +++ linux/kernel/Makefile Mon May 21 10:42:15 2001 | |
718 | @@ -19,6 +19,8 @@ | |
719 | - obj-$(CONFIG_UID16) += uid16.o | |
720 | obj-$(CONFIG_MODULES) += ksyms.o | |
721 | obj-$(CONFIG_PM) += pm.o | |
722 | + obj-$(CONFIG_KALLSYMS) += kallsyms.o | |
723 | +obj-$(CONFIG_LIDS) += lids.o rmd160.o | |
724 | +obj-$(CONFIG_LIDS_SA_THROUGH_NET) += klids.o lids_net.o | |
725 |