--- lids-1.0.8-2.4.4/lids-1.0.8-2.4.4.patch~ Mon May 21 09:38:10 2001 +++ lids-1.0.8-2.4.4/lids-1.0.8-2.4.4.patch Sat May 26 16:14:32 2001 @@ -310,278 +310,6 @@ bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ endmenu +source kernel/Config.in -diff -N -r -u linux-2.4.4/arch/mips64/config.in~ linux/arch/mips64/config.in~ ---- linux-2.4.4/arch/mips64/config.in~ Thu Jan 1 08:00:00 1970 -+++ linux/arch/mips64/config.in~ Mon May 21 10:42:14 2001 -@@ -0,0 +1,268 @@ -+# -+# For a description of the syntax of this configuration file, -+# see Documentation/kbuild/config-language.txt. -+# -+mainmenu_name "Linux Kernel Configuration" -+ -+mainmenu_option next_comment -+comment 'Code maturity level options' -+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL -+endmenu -+ -+mainmenu_option next_comment -+comment 'Machine selection' -+bool 'Support for SGI IP22' CONFIG_SGI_IP22 -+bool 'Support for SGI IP27' CONFIG_SGI_IP27 -+if [ "$CONFIG_SGI_IP27" = "y" ]; then -+ bool ' IP27 N-Mode' CONFIG_SGI_SN0_N_MODE -+ bool ' Discontiguous Memory Support' CONFIG_DISCONTIGMEM -+ bool ' NUMA support' CONFIG_NUMA -+ bool ' Mapped kernel support' CONFIG_MAPPED_KERNEL -+ bool ' Kernel text replication support' CONFIG_REPLICATE_KTEXT -+ bool ' Exception handler replication support' CONFIG_REPLICATE_EXHANDLERS -+ bool ' Multi-Processing support' CONFIG_SMP -+ #bool ' IP27 XXL' CONFIG_SGI_SN0_XXL -+fi -+endmenu -+ -+# -+# Select some configuration options automatically based on user selections -+# -+unset CONFIG_ARC32 -+unset CONFIG_ARC64 -+unset CONFIG_BINFMT_ELF32 -+unset CONFIG_BOARD_SCACHE -+unset CONFIG_BOOT_ELF32 -+unset CONFIG_BOOT_ELF64 -+unset CONFIG_COHERENT_IO -+unset CONFIG_ISA -+unset CONFIG_PCI -+ -+if [ "$CONFIG_SGI_IP22" = "y" ]; then -+ define_bool CONFIG_BOOT_ELF32 y -+ define_bool CONFIG_ARC32 y -+ define_bool CONFIG_BOARD_SCACHE y -+ define_bool CONFIG_ARC_MEMORY y -+ define_bool CONFIG_SGI y -+fi -+ -+if [ "$CONFIG_SGI_IP27" = "y" ]; then -+ define_bool CONFIG_BOOT_ELF64 y -+ define_bool CONFIG_ARC64 y -+ define_bool CONFIG_COHERENT_IO y -+ define_bool CONFIG_PCI y -+ define_bool CONFIG_QL_ISP_A64 y -+fi -+ -+if [ "$CONFIG_ISA" != "y" ]; then -+ define_bool CONFIG_ISA n -+ define_bool CONFIG_EISA n -+else -+ define_bool CONFIG_EISA y -+fi -+ -+if [ "$CONFIG_PCI" != "y" ]; then -+ define_bool CONFIG_PCI n -+fi -+ -+define_bool CONFIG_MCA n -+define_bool CONFIG_SBUS n -+ -+mainmenu_option next_comment -+comment 'CPU selection' -+ -+choice 'CPU type' \ -+ "R4300 CONFIG_CPU_R4300 \ -+ R4x00 CONFIG_CPU_R4X00 \ -+ R5000 CONFIG_CPU_R5000 \ -+ R52x0 CONFIG_CPU_NEVADA \ -+ R8000 CONFIG_CPU_R8000 \ -+ R10000 CONFIG_CPU_R10000" R4x00 -+endmenu -+ -+mainmenu_option next_comment -+comment 'General setup' -+ -+if [ "$CONFIG_CPU_R10000" = "y" ]; then -+ bool 'Support for large 64-bit configurations' CONFIG_MIPS_INSANE_LARGE -+fi -+bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN -+ -+bool 'Networking support' CONFIG_NET -+ -+source drivers/pci/Config.in -+ -+bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG -+ -+if [ "$CONFIG_HOTPLUG" = "y" ] ; then -+ source drivers/pcmcia/Config.in -+else -+ define_bool CONFIG_PCMCIA n -+fi -+ -+bool 'System V IPC' CONFIG_SYSVIPC -+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT -+bool 'Sysctl support' CONFIG_SYSCTL -+tristate 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF -+bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT -+if [ "$CONFIG_MIPS32_COMPAT" = "y" ]; then -+ define_bool CONFIG_BINFMT_ELF32 y -+fi -+tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -+ -+endmenu -+ -+mainmenu_option next_comment -+comment 'Loadable module support' -+bool 'Enable loadable module support' CONFIG_MODULES -+if [ "$CONFIG_MODULES" = "y" ]; then -+ bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS -+ bool 'Kernel module loader' CONFIG_KMOD -+fi -+ -+source drivers/pci/Config.in -+ -+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ bool 'Support for frame buffer devices (EXPERIMENTAL)' CONFIG_FB -+fi -+ -+endmenu -+ -+source drivers/mtd/Config.in -+ -+source drivers/block/Config.in -+ -+source drivers/md/Config.in -+ -+if [ "$CONFIG_NET" = "y" ]; then -+ source net/Config.in -+fi -+ -+source drivers/telephony/Config.in -+ -+mainmenu_option next_comment -+comment 'ATA/IDE/MFM/RLL support' -+ -+tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE -+ -+if [ "$CONFIG_IDE" != "n" ]; then -+ source drivers/ide/Config.in -+else -+ define_bool CONFIG_BLK_DEV_IDE_MODES n -+ define_bool CONFIG_BLK_DEV_HD n -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'SCSI support' -+ -+tristate 'SCSI support' CONFIG_SCSI -+ -+if [ "$CONFIG_SCSI" != "n" ]; then -+ source drivers/scsi/Config.in -+fi -+endmenu -+ -+source drivers/i2o/Config.in -+ -+if [ "$CONFIG_NET" = "y" ]; then -+ mainmenu_option next_comment -+ comment 'Network device support' -+ -+ bool 'Network device support' CONFIG_NETDEVICES -+ if [ "$CONFIG_NETDEVICES" = "y" ]; then -+ source drivers/net/Config.in -+ if [ "$CONFIG_SGI_IP22" = "y" ]; then -+ bool 'SGI Seeq ethernet controller support' CONFIG_SGISEEQ -+ fi -+ if [ "$CONFIG_DECSTATION" = "y" ]; then -+ bool 'DEC LANCE ethernet controller support' CONFIG_DECLANCE -+ fi -+ if [ "$CONFIG_BAGET_MIPS" = "y" ]; then -+ tristate 'Baget AMD LANCE support' CONFIG_BAGETLANCE -+ tristate 'Baget Backplane Shared Memory support' CONFIG_BAGETBSM -+ fi -+ if [ "$CONFIG_ATM" = "y" ]; then -+ source drivers/atm/Config.in -+ fi -+ fi -+ endmenu -+fi -+ -+source net/ax25/Config.in -+ -+source net/irda/Config.in -+ -+mainmenu_option next_comment -+comment 'ISDN subsystem' -+ -+if [ "$CONFIG_NET" != "n" ]; then -+ tristate 'ISDN support' CONFIG_ISDN -+ if [ "$CONFIG_ISDN" != "n" ]; then -+ source drivers/isdn/Config.in -+ fi -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'Old CD-ROM drivers (not SCSI, not IDE)' -+ -+bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI -+if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then -+ source drivers/cdrom/Config.in -+fi -+endmenu -+ -+source drivers/char/Config.in -+ -+#source drivers/misc/Config.in -+ -+source drivers/media/Config.in -+ -+source fs/Config.in -+ -+if [ "$CONFIG_VT" = "y" ]; then -+ mainmenu_option next_comment -+ comment 'Console drivers' -+ if [ "$CONFIG_SGI_IP22" = "y" ]; then -+ tristate 'SGI Newport Console support' CONFIG_SGI_NEWPORT_CONSOLE -+ if [ "$CONFIG_SGI_NEWPORT_CONSOLE" != "y" ]; then -+ define_bool CONFIG_DUMMY_CONSOLE y -+ else -+ define_bool CONFIG_FONT_8x16 y -+ fi -+ fi -+ endmenu -+fi -+ -+if [ "$CONFIG_PROC_FS" = "y" ]; then -+ define_bool CONFIG_KCORE_ELF y -+fi -+ -+mainmenu_option next_comment -+comment 'Sound' -+ -+tristate 'Sound card support' CONFIG_SOUND -+if [ "$CONFIG_SOUND" != "n" ]; then -+ source drivers/sound/Config.in -+fi -+endmenu -+ -+if [ "$CONFIG_SGI_IP22" = "y" ]; then -+ source drivers/sgi/Config.in -+fi -+ -+source drivers/usb/Config.in -+source drivers/input/Config.in -+ -+mainmenu_option next_comment -+comment 'Kernel hacking' -+ -+#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC -+bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE -+if [ "$CONFIG_MODULES" = "y" ]; then -+ bool ' Build fp execption handler module' CONFIG_MIPS_FPE_MODULE -+fi -+bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG -+bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ -+endmenu diff -N -r -u linux-2.4.4/arch/parisc/config.in linux/arch/parisc/config.in --- linux-2.4.4/arch/parisc/config.in Mon May 21 15:24:43 2001 +++ linux/arch/parisc/config.in Mon May 21 10:42:14 2001 @@ -607,80 +335,6 @@ endmenu +source kernel/Config.in -diff -N -r -u linux-2.4.4/arch/s390/config.in~ linux/arch/s390/config.in~ ---- linux-2.4.4/arch/s390/config.in~ Thu Jan 1 08:00:00 1970 -+++ linux/arch/s390/config.in~ Mon May 21 10:42:14 2001 -@@ -0,0 +1,70 @@ -+# -+# For a description of the syntax of this configuration file, -+# see Documentation/kbuild/config-language.txt. -+# -+ -+define_bool CONFIG_ISA n -+define_bool CONFIG_EISA n -+define_bool CONFIG_MCA n -+define_bool CONFIG_UID16 y -+ -+mainmenu_name "Linux Kernel Configuration" -+define_bool CONFIG_ARCH_S390 y -+ -+mainmenu_option next_comment -+comment 'Code maturity level options' -+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL -+endmenu -+ -+mainmenu_option next_comment -+comment 'Loadable module support' -+bool 'Enable loadable module support' CONFIG_MODULES -+if [ "$CONFIG_MODULES" = "y" ]; then -+ bool ' Set version information on all module symbols' CONFIG_MODVERSIONS -+ bool ' Kernel module loader' CONFIG_KMOD -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'Processor type and features' -+bool 'Symmetric multi-processing support' CONFIG_SMP -+bool 'IEEE FPU emulation' CONFIG_IEEEFPU_EMULATION -+endmenu -+ -+mainmenu_option next_comment -+comment 'General setup' -+bool 'Fast IRQ handling' CONFIG_FAST_IRQ -+bool 'Builtin IPL record support' CONFIG_IPL -+if [ "$CONFIG_IPL" = "y" ]; then -+ choice 'IPL method generated into head.S' \ -+ "tape CONFIG_IPL_TAPE \ -+ vm_reader CONFIG_IPL_VM" tape -+fi -+bool 'Networking support' CONFIG_NET -+bool 'System V IPC' CONFIG_SYSVIPC -+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT -+bool 'Sysctl support' CONFIG_SYSCTL -+define CONFIG_KCORE ELF -+tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF -+tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -+bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG -+endmenu -+ -+source drivers/s390/Config.in -+ -+if [ "$CONFIG_NET" = "y" ]; then -+ source net/Config.in -+fi -+ -+source fs/Config.in -+ -+mainmenu_option next_comment -+comment 'Kernel hacking' -+ -+#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC -+if [ "$CONFIG_CTC" = "y" ]; then -+ bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG -+fi -+# this does not work. bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ -+endmenu -+ diff -N -r -u linux-2.4.4/arch/sh/config.in linux/arch/sh/config.in --- linux-2.4.4/arch/sh/config.in Mon May 21 15:24:44 2001 +++ linux/arch/sh/config.in Mon May 21 10:42:14 2001 @@ -706,351 +360,6 @@ endmenu + +source kernel/Config.in -diff -N -r -u linux-2.4.4/arch/sparc64/config.in~ linux/arch/sparc64/config.in~ ---- linux-2.4.4/arch/sparc64/config.in~ Thu Jan 1 08:00:00 1970 -+++ linux/arch/sparc64/config.in~ Mon May 21 10:42:14 2001 -@@ -0,0 +1,341 @@ -+# $Id$ -+# For a description of the syntax of this configuration file, -+# see the Configure script. -+# -+mainmenu_name "Linux/UltraSPARC Kernel Configuration" -+ -+mainmenu_option next_comment -+comment 'Code maturity level options' -+bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL -+endmenu -+ -+mainmenu_option next_comment -+comment 'Loadable module support' -+bool 'Enable loadable module support' CONFIG_MODULES -+if [ "$CONFIG_MODULES" = "y" ]; then -+ bool ' Set version information on all symbols for modules' CONFIG_MODVERSIONS -+ bool ' Kernel module loader' CONFIG_KMOD -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'General setup' -+ -+define_bool CONFIG_VT y -+define_bool CONFIG_VT_CONSOLE y -+ -+bool 'Symmetric multi-processing support' CONFIG_SMP -+ -+# Identify this as a Sparc64 build -+define_bool CONFIG_SPARC64 y -+ -+# Global things across all Sun machines. -+define_bool CONFIG_HAVE_DEC_LOCK y -+define_bool CONFIG_ISA n -+define_bool CONFIG_EISA n -+define_bool CONFIG_MCA n -+define_bool CONFIG_PCMCIA n -+define_bool CONFIG_SBUS y -+define_bool CONFIG_SBUSCHAR y -+define_bool CONFIG_BUSMOUSE y -+define_bool CONFIG_SUN_MOUSE y -+define_bool CONFIG_SERIAL y -+define_bool CONFIG_SUN_SERIAL y -+define_bool CONFIG_SERIAL_CONSOLE y -+define_bool CONFIG_SUN_KEYBOARD y -+define_bool CONFIG_SUN_CONSOLE y -+define_bool CONFIG_SUN_AUXIO y -+define_bool CONFIG_SUN_IO y -+bool 'PCI support' CONFIG_PCI -+source drivers/pci/Config.in -+ -+tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS -+bool 'Networking support' CONFIG_NET -+bool 'System V IPC' CONFIG_SYSVIPC -+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT -+bool 'Sysctl support' CONFIG_SYSCTL -+if [ "$CONFIG_PROC_FS" = "y" ]; then -+ define_bool CONFIG_KCORE_ELF y -+fi -+bool 'Kernel support for Linux/Sparc 32bit binary compatibility' CONFIG_SPARC32_COMPAT -+if [ "$CONFIG_SPARC32_COMPAT" != "n" ]; then -+ tristate ' Kernel support for 32-bit ELF binaries' CONFIG_BINFMT_ELF32 -+ bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 -+fi -+tristate 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF -+tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -+bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL -+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ tristate 'Solaris binary emulation (EXPERIMENTAL)' CONFIG_SOLARIS_EMUL -+fi -+source drivers/parport/Config.in -+dep_tristate ' Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT -+if [ "$CONFIG_PCI" = "y" ]; then -+ tristate 'SUNW, envctrl support' CONFIG_ENVCTRL -+ tristate '7-Segment Display support' CONFIG_DISPLAY7SEG -+ tristate 'CP1XXX Hardware Watchdog support' CONFIG_WATCHDOG_CP1XXX -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'Console drivers' -+bool 'PROM console' CONFIG_PROM_CONSOLE -+bool 'Support Frame buffer devices' CONFIG_FB -+source drivers/video/Config.in -+endmenu -+ -+source drivers/sbus/char/Config.in -+source drivers/sbus/audio/Config.in -+source drivers/mtd/Config.in -+mainmenu_option next_comment -+comment 'Block devices' -+ -+bool 'Normal floppy disk support' CONFIG_BLK_DEV_FD -+ -+tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP -+dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET -+ -+source drivers/md/Config.in -+ -+tristate 'RAM disk support' CONFIG_BLK_DEV_RAM -+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then -+ int ' Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096 -+fi -+dep_bool ' Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM -+ -+endmenu -+ -+if [ "$CONFIG_NET" = "y" ]; then -+ source net/Config.in -+fi -+ -+mainmenu_option next_comment -+comment 'ATA/IDE/MFM/RLL support' -+ -+tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE -+ -+if [ "$CONFIG_IDE" != "n" ]; then -+ source drivers/ide/Config.in -+else -+ define_bool CONFIG_BLK_DEV_IDE_MODES n -+ define_bool CONFIG_BLK_DEV_HD n -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'SCSI support' -+ -+tristate 'SCSI support' CONFIG_SCSI -+ -+if [ "$CONFIG_SCSI" != "n" ]; then -+ comment 'SCSI support type (disk, tape, CDrom)' -+ -+ dep_tristate ' SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI -+ -+ if [ "$CONFIG_BLK_DEV_SD" != "n" ]; then -+ int 'Maximum number of SCSI disks that can be loaded as modules' CONFIG_SD_EXTRA_DEVS 40 -+ fi -+ -+ dep_tristate ' SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI -+ -+ if [ "$CONFIG_BLK_DEV_ST" != "n" ]; then -+ int 'Maximum number of SCSI tapes that can be loaded as modules' CONFIG_ST_EXTRA_DEVS 2 -+ fi -+ -+ dep_tristate ' SCSI CDROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI -+ -+ if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then -+ bool ' Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR -+ int 'Maximum number of CDROM devices that can be loaded as modules' CONFIG_SR_EXTRA_DEVS 2 -+ fi -+ -+ dep_tristate ' SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI -+ -+ comment 'Some SCSI devices (e.g. CD jukebox) support multiple LUNs' -+ -+ bool ' Probe all LUNs on each SCSI device' CONFIG_SCSI_MULTI_LUN -+ -+ bool ' Verbose SCSI error reporting (kernel size +=12K)' CONFIG_SCSI_CONSTANTS -+ bool ' SCSI logging facility' CONFIG_SCSI_LOGGING -+ -+ mainmenu_option next_comment -+ comment 'SCSI low-level drivers' -+ -+ dep_tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI -+ dep_tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI -+ -+ if [ "$CONFIG_PCI" != "n" ]; then -+ dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI -+ if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then -+ bool ' Enable tagged command queueing (TCQ) by default' CONFIG_AIC7XXX_TAGGED_QUEUEING -+ int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 8 -+ bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS -+ int ' Delay in seconds after SCSI bus reset' CONFIG_AIC7XXX_RESET_DELAY 5 -+ fi -+ dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI -+ dep_tristate 'SYM53C8XX SCSI support' CONFIG_SCSI_SYM53C8XX $CONFIG_SCSI -+ if [ "$CONFIG_SCSI_NCR53C8XX" != "n" -o "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then -+ int 'default tagged command queue depth' CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS 8 -+ int 'maximum number of queued commands' CONFIG_SCSI_NCR53C8XX_MAX_TAGS 32 -+ int 'synchronous transfers frequency in MHz' CONFIG_SCSI_NCR53C8XX_SYNC 10 -+ bool ' enable profiling' CONFIG_SCSI_NCR53C8XX_PROFILE -+ if [ "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then -+ bool ' include support for the NCR PQS/PDS SCSI card' CONFIG_SCSI_NCR53C8XX_PQS_PDS -+ fi -+ if [ "$CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS" = "0" ]; then -+ bool ' not allow targets to disconnect' CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT -+ fi -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ bool ' assume boards are SYMBIOS compatible (EXPERIMENTAL)' CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT -+ fi -+ fi -+ dep_tristate 'Qlogic ISP SCSI support' CONFIG_SCSI_QLOGIC_ISP $CONFIG_SCSI -+ dep_tristate 'Qlogic ISP FC SCSI support' CONFIG_SCSI_QLOGIC_FC $CONFIG_SCSI -+ fi -+ -+ endmenu -+fi -+endmenu -+ -+source drivers/message/fusion/Config.in -+ -+source drivers/fc4/Config.in -+ -+if [ "$CONFIG_PCI" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ mainmenu_option next_comment -+ comment 'IEEE 1394 (FireWire) support' -+ -+ dep_tristate 'IEEE 1394 (FireWire) support (EXPERIMENTAL)' CONFIG_IEEE1394 $CONFIG_PCI -+ -+ if [ "$CONFIG_IEEE1394" != "n" ]; then -+ dep_tristate 'Texas Instruments PCILynx support' CONFIG_IEEE1394_PCILYNX $CONFIG_IEEE1394 -+ if [ "$CONFIG_IEEE1394_PCILYNX" != "n" ]; then -+ bool ' Use PCILynx local RAM' CONFIG_IEEE1394_PCILYNX_LOCALRAM -+ bool ' Support for non-IEEE1394 local ports' CONFIG_IEEE1394_PCILYNX_PORTS -+ fi -+ -+ dep_tristate 'OHCI (Open Host Controller Interface) support' CONFIG_IEEE1394_OHCI1394 $CONFIG_IEEE1394 -+ -+ dep_tristate 'Raw IEEE1394 I/O support' CONFIG_IEEE1394_RAWIO $CONFIG_IEEE1394 -+ -+ bool 'Excessive debugging output' CONFIG_IEEE1394_VERBOSEDEBUG -+ fi -+ endmenu -+fi -+ -+if [ "$CONFIG_NET" = "y" ]; then -+ mainmenu_option next_comment -+ comment 'Network device support' -+ -+ bool 'Network device support' CONFIG_NETDEVICES -+ if [ "$CONFIG_NETDEVICES" = "y" ]; then -+ tristate ' Dummy net driver support' CONFIG_DUMMY -+ tristate ' Bonding driver support' CONFIG_BONDING -+ tristate ' Universal TUN/TAP device driver support' CONFIG_TUN -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ if [ "$CONFIG_NETLINK" = "y" ]; then -+ tristate ' Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP -+ fi -+ fi -+ tristate ' PPP (point-to-point) support' CONFIG_PPP -+ if [ ! "$CONFIG_PPP" = "n" ]; then -+ dep_tristate ' PPP support for async serial ports' CONFIG_PPP_ASYNC $CONFIG_PPP -+ dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP -+ dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP -+ dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP m -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP -+ fi -+ fi -+ tristate ' SLIP (serial line) support' CONFIG_SLIP -+ if [ "$CONFIG_SLIP" != "n" ]; then -+ bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED -+ bool ' Keepalive and linefill' CONFIG_SLIP_SMART -+ bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6 -+ fi -+ -+ mainmenu_option next_comment -+ comment 'Ethernet (10 or 100Mbit)' -+ -+ tristate 'Sun LANCE support' CONFIG_SUNLANCE -+ tristate 'Sun Happy Meal 10/100baseT support' CONFIG_HAPPYMEAL -+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -+ tristate 'Sun BigMAC 10/100baseT support (EXPERIMENTAL)' CONFIG_SUNBMAC -+ fi -+ tristate ' Sun QuadEthernet support' CONFIG_SUNQE -+ if [ "$CONFIG_PCI" = "y" ]; then -+ tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5 -+ tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP -+ tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX -+ tristate 'RealTek RTL-8139 support' CONFIG_8139TOO -+ tristate 'PCI NE2000 support' CONFIG_NE2K_PCI -+ tristate 'VIA Rhine support' CONFIG_VIA_RHINE -+ tristate 'EtherExpressPro/100 support' CONFIG_EEPRO100 -+ tristate 'Adaptec Starfire support' CONFIG_ADAPTEC_STARFIRE -+ fi -+ endmenu -+ -+ mainmenu_option next_comment -+ comment 'Ethernet (1000 Mbit)' -+ -+ if [ "$CONFIG_PCI" = "y" ]; then -+ tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC -+ if [ "$CONFIG_ACENIC" != "n" ]; then -+ bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I -+ fi -+ tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN -+ fi -+ tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS -+ endmenu -+ -+ bool 'FDDI driver support' CONFIG_FDDI -+ if [ "$CONFIG_FDDI" = "y" ]; then -+ tristate ' SysKonnect FDDI PCI support' CONFIG_SKFP -+ fi -+ -+ if [ "$CONFIG_ATM" = "y" ]; then -+ source drivers/atm/Config.in -+ fi -+ fi -+ endmenu -+fi -+ -+# This one must be before the filesystem configs. -DaveM -+mainmenu_option next_comment -+comment 'Unix 98 PTY support' -+bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS -+if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then -+ int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256 -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'Video For Linux' -+tristate 'Video For Linux' CONFIG_VIDEO_DEV -+if [ "$CONFIG_VIDEO_DEV" != "n" ]; then -+ if [ "$CONFIG_PCI" != "n" ]; then -+ dep_tristate ' BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV -+ fi -+fi -+endmenu -+ -+mainmenu_option next_comment -+comment 'XFree86 DRI support' -+bool 'Direct Rendering Manager (XFree86 DRI support)' CONFIG_DRM -+dep_tristate ' Creator/Creator3D' CONFIG_DRM_FFB $CONFIG_DRM -+endmenu -+ -+source fs/Config.in -+ -+mainmenu_option next_comment -+comment 'Watchdog' -+ -+tristate 'Software watchdog' CONFIG_SOFT_WATCHDOG -+endmenu -+ -+mainmenu_option next_comment -+comment 'Kernel hacking' -+ -+bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ -+#bool 'ECache flush trap support at ta 0x72' CONFIG_EC_FLUSH_TRAP -+endmenu diff -N -r -u linux-2.4.4/fs/buffer.c linux/fs/buffer.c --- linux-2.4.4/fs/buffer.c Mon May 21 15:25:23 2001 +++ linux/fs/buffer.c Mon May 21 10:42:14 2001 @@ -1768,9 +1768,9 @@ --- linux-2.4.4/kernel/Makefile Mon May 21 10:55:58 2001 +++ linux/kernel/Makefile Mon May 21 10:42:15 2001 @@ -19,6 +19,8 @@ - obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += ksyms.o obj-$(CONFIG_PM) += pm.o + obj-$(CONFIG_KALLSYMS) += kallsyms.o +obj-$(CONFIG_LIDS) += lids.o rmd160.o +obj-$(CONFIG_LIDS_SA_THROUGH_NET) += klids.o lids_net.o