prerelease work

24 files changed, 1285 insertions, 49 deletions

diff --git a/i386/Drivers.in b/i386/Drivers.in
new file mode 100644
index 0000000..e4d2260
--- /dev/null
+++ b/i386/Drivers.in
@@ -0,0 +1,117 @@
+AC_INIT(i386/i386asm.sym)
+
+sinclude([../Drivers.macros])
+
+AC_CONFIG_HEADER(device-drivers.h)
+
+dnl Aliases have to come first.
+
+AC_DRIVER_ALIAS(3c501, el1)
+AC_DRIVER_ALIAS(3c503, el2)
+AC_DRIVER_ALIAS(3c59x, vortex)
+AC_DRIVER_ALIAS(hpj2577, hp100)
+AC_DRIVER_ALIAS(hpj2573, hp100)
+AC_DRIVER_ALIAS(hpj2585, hp100)
+AC_DRIVER_ALIAS(hp27248b, hp100)
+AC_DRIVER_ALIAS(eth32, eth16i)
+AC_DRIVER_ALIAS(znote, znet)
+AC_DRIVER_ALIAS(de100, depca)
+AC_DRIVER_ALIAS(de101, depca)
+AC_DRIVER_ALIAS(de200, depca)
+AC_DRIVER_ALIAS(de201, depca)
+AC_DRIVER_ALIAS(de202, depca)
+AC_DRIVER_ALIAS(de210, depca)
+AC_DRIVER_ALIAS(de422, depca)
+AC_DRIVER_ALIAS(de203, ewrk3)
+AC_DRIVER_ALIAS(de204, ewrk3)
+AC_DRIVER_ALIAS(de205, ewrk3)
+AC_DRIVER_ALIAS(de425, de4x5)
+AC_DRIVER_ALIAS(de434, de4x5)
+AC_DRIVER_ALIAS(de435, de4x5)
+AC_DRIVER_ALIAS(de500, de4x5)
+AC_DRIVER_ALIAS(3c507, el16)
+AC_DRIVER_ALIAS(3c505, elplus)
+
+
+dnl Kinds of drivers that have gobs of source files that get brought in.
+
+AC_DRIVER_CLASS(scsi, CONFIG_SCSI, constants.o hosts.o scsi.o scsi_debug.o scsi_ioctl.o scsi_proc.o scsicam.o sd.o sd_ioctl.o sr.o sr_ioctl.o)
+
+AC_DRIVER_CLASS(net, CONFIG_INET, linux_net.o Space.o dev.o net_init.o)
+
+dnl Strictly speaking, we could have a `linux' option too, but it's
+dnl not possible to built a useful kernel without at least one Linux
+dnl driver, so that's not really necessary.
+
+
+dnl Serial devices
+
+AC_DRIVER(com, CONFIG_MACH_COM, com.o)
+
+
+dnl non-SCSI Disk controllers
+
+AC_DRIVER(floppy, CONFIG_BLK_DEV_FD, floppy.o)
+AC_DRIVER(ide, CONFIG_BLK_DEV_IDE, cmd640.o ide-cd.o ide.o rz1000.o triton.o)
+
+
+dnl SCSI Disk controllers
+
+AC_DRIVER(advansys, CONFIG_SCSI_ADVANSYS, advansys.o, scsi)
+AC_DRIVER(buslogic, CONFIG_SCSI_BUSLOGIC, BusLogic.o, scsi)
+AC_DRIVER(u1434f, CONFIG_SCSI_U14_34F, u14-34f.o, scsi)
+AC_DRIVER(ultrastor, CONFIG_SCSI_ULTRASTOR, ultrastor.o, scsi)
+AC_DRIVER(aha152x, CONFIG_SCSI_AHA152X, aha152x.o, scsi)
+AC_DRIVER(aha1542, CONFIG_SCSI_AHA1542, aha1542.o, scsi)
+AC_DRIVER(aha1740, CONFIG_SCSI_AHA1740, aha1740.o, scsi)
+AC_DRIVER(aic7xxx, CONFIG_SCSI_AIC7XXX, aic7xxx.o, scsi)
+AC_DRIVER(futuredomain, CONFIG_SCSI_FUTURE_DOMAIN, fdomain.o, scsi)
+AC_DRIVER(in2000, CONFIG_SCSI_IN2000, in2000.o, scsi)
+AC_DRIVER(ncr5380, CONFIG_SCSI_GENERIC_NCR5380, g_NCR5380.o, scsi)
+AC_DRIVER(ncr53c406a, CONFIG_SCSI_NCR53C406A, NCR53c406a.o, scsi)
+AC_DRIVER(qlogic, CONFIG_SCSI_QLOGIC, qlogic.o, scsi)
+AC_DRIVER(pas16, CONFIG_SCSI_PASS16, pas16.o, scsi)
+AC_DRIVER(seagate, CONFIG_SCSI_SEAGATE, seagate.o, scsi)
+AC_DRIVER(t128, CONFIG_SCSI_T128, t128.o, scsi)
+AC_DRIVER(ncr53c7xx, CONFIG_SCSI_NCR53C7xx, 53c7,8xx.o, scsi)
+AC_DRIVER(eatadma, CONFIG_SCSI_EATA_DMA, eata_dma.o, scsi)
+AC_DRIVER(eatapio, CONFIG_SCSI_EATA_PIO, eata_pio.o, scsi)
+AC_DRIVER(wd7000, CONFIG_SCSI_7000FASST, wd7000.o, scsi)
+AC_DRIVER(eata, CONFIG_SCSI_EATA, eata.o, scsi)
+AC_DRIVER(am53c974, CONFIG_SCSI_AM53C974, AM53C974.o, scsi)
+
+
+dnl Ethernet controllers
+
+AC_DRIVER(ne2000, CONFIG_NE2000, ne.o 8390.o, net)
+AC_DRIVER(el2, CONFIG_EL2, 3c403.o 8390.o, net)
+AC_DRIVER(wd80x3, CONFIG_WD80x3, wd.o 8390.o, net)
+AC_DRIVER(el1, CONFIG_EL1, 3c501.o, net)
+AC_DRIVER(ul, CONFIG_ULTRA, smc-ultra.o 8390.o, net)
+AC_DRIVER(hplanplus, CONFIG_HPLAN_PLUS, hp-plus.o, net)
+AC_DRIVER(hplan, CONFIG_HPLAN, hp.o 8390.o, net)
+AC_DRIVER(vortex, CONFIG_VORTEX, 3c59x.o, net)
+AC_DRIVER(seeq8005, CONFIG_SEEQ8005, seeq8005.o, net)
+AC_DRIVER(hp100, CONFIG_HP100, hp100.o, net)
+AC_DRIVER(ac3200, CONFIG_AC3200, ac3200.o 8390.o, net)
+AC_DRIVER(e2100, CONFIG_E2100, e2100.o 8390.o, net)
+AC_DRIVER(at1700, CONFIG_AT1700, at1700.o, net)
+AC_DRIVER(eth16i, CONFIG_ETH16I, eth16i.o, net)
+AC_DRIVER(znet, CONFIG_ZNET, znet.o, net)
+AC_DRIVER(eexpress, CONFIG_EEXPRESS, eexpress.o, net)
+AC_DRIVER(eexpresspro, CONFIG_EEXPRESS_PRO, eepro.o, net)
+AC_DRIVER(depca, CONFIG_DEPCA, depca.o, net)
+AC_DRIVER(ewrk3, CONFIG_EWRK3, ewrk3.o, net)
+AC_DRIVER(de4x5, CONFIG_DE4X5, de4x5.o, net)
+AC_DRIVER(apricot, CONFIG_APRICOT, apricot.o, net)
+AC_DRIVER(wavelan, CONFIG_WAVELAN, wavelan.o, net)
+AC_DRIVER(el16, CONFIG_EL16, 3c507.o, net)
+AC_DRIVER(elplus, CONFIG_ELPLUS, 3c505.o, net)
+AC_DRIVER(de600, CONFIG_DE600, de600.o, net)
+AC_DRIVER(de620, CONFIG_DE620, de620.o, net)
+AC_DRIVER(skg16, CONFIG_SK_G16, sk_g16.o, net)
+AC_DRIVER(ni52, CONFIG_NI52, ni52.o, net)
+AC_DRIVER(ni65, CONFIG_NI65, ni65.o, net)
+AC_DRIVER(atp, CONFIG_ATP, apt.o, net)
+
+AC_OUTPUT(driverlist)
diff --git a/i386/Files b/i386/Files
new file mode 100644
index 0000000..9521be3
--- /dev/null
+++ b/i386/Files
@@ -0,0 +1,628 @@
+i386/Makefrag
+i386/bogus/aha.h
+i386/bogus/asc.h
+i386/bogus/at3c501.h
+i386/bogus/blit.h
+i386/bogus/com.h
+i386/bogus/de6c.h
+i386/bogus/eaha.h
+i386/bogus/evc.h
+i386/bogus/fd.h
+i386/bogus/fpe.h
+i386/bogus/hd.h
+i386/bogus/hpp.h
+i386/bogus/lpr.h
+i386/bogus/mach_machine_routines.h
+i386/bogus/ne.h
+i386/bogus/ns8390.h
+i386/bogus/nscsi.h
+i386/bogus/par.h
+i386/bogus/pc586.h
+i386/bogus/platforms.h
+i386/bogus/rc.h
+i386/bogus/sbic.h
+i386/bogus/sci.h
+i386/bogus/sii.h
+i386/bogus/siop.h
+i386/bogus/ul.h
+i386/bogus/wd.h
+i386/bogus/wt.h
+i386/dos/dos_buf.c
+i386/dos/dos_check_err.c
+i386/dos/dos_close.c
+i386/dos/dos_fstat.c
+i386/dos/dos_gettimeofday.c
+i386/dos/dos_io.h
+i386/dos/dos_open.c
+i386/dos/dos_read.c
+i386/dos/dos_rename.c
+i386/dos/dos_seek.c
+i386/dos/dos_tcgetattr.c
+i386/dos/dos_unlink.c
+i386/dos/dos_write.c
+i386/dos/putchar.c
+i386/dos/i16/gdt.h
+i386/dos/i16/gdt_sels.h
+i386/dos/i16/i16_crt0.S
+i386/dos/i16/i16_crt0.h
+i386/dos/i16/i16_dos.h
+i386/dos/i16/i16_dos_mem.c
+i386/dos/i16/i16_exit.c
+i386/dos/i16/i16_main.c
+i386/dos/i16/i16_putchar.c
+i386/dos/i16/i16_vcpi.c
+i386/dos/i16/i16_xms.c
+i386/dos/i16/idt.h
+i386/dos/i16/phys_mem_sources.h
+i386/i386/ast.h
+i386/i386/ast_check.c
+i386/i386/ast_types.h
+i386/i386/cpu_number.h
+i386/i386/cswitch.S
+i386/i386/db_disasm.c
+i386/i386/db_interface.c
+i386/i386/db_machdep.h
+i386/i386/db_trace.c
+i386/i386/debug.h
+i386/i386/debug_i386.c
+i386/i386/debug_trace.S
+i386/i386/eflags.h
+i386/i386/fpu.c
+i386/i386/fpe.b
+i386/i386/fpe.b_elf
+i386/i386/fpe_linkage.c
+i386/i386/fpu.h
+i386/i386/gdt.c
+i386/i386/gdt.h
+i386/i386/hardclock.c
+i386/i386/i386asm.sym
+i386/i386/idt-gen.h
+i386/i386/idt.c
+i386/i386/idt_inittab.S
+i386/i386/io_emulate.c
+i386/i386/io_emulate.h
+i386/i386/io_map.c
+i386/i386/io_port.h
+i386/i386/iopb.c
+i386/i386/iopb.h
+i386/i386/ipl.h
+i386/i386/ktss.c
+i386/i386/ktss.h
+i386/i386/ldt.c
+i386/i386/kttd_interface.c
+i386/i386/kttd_machdep.h
+i386/i386/ldt.h
+i386/i386/lock.h
+i386/i386/locore.S
+i386/i386/loose_ends.c
+i386/i386/mach_i386.srv
+i386/i386/mach_param.h
+i386/i386/machine_routines.h
+i386/i386/machspl.h
+i386/i386/mp_desc.c
+i386/i386/mp_desc.h
+i386/i386/pcb.c
+i386/i386/phys.c
+i386/i386/pic.c
+i386/i386/pic.h
+i386/i386/pio.h
+i386/i386/pit.c
+i386/i386/pit.h
+i386/i386/pmap.h
+i386/i386/proc_reg.h
+i386/i386/sched_param.h
+i386/i386/seg.c
+i386/i386/seg.h
+i386/i386/setjmp.h
+i386/i386/spl.S
+i386/i386/spl.h
+i386/i386/thread.h
+i386/i386/time_stamp.h
+i386/i386/timer.h
+i386/i386/trap.c
+i386/i386/trap.h
+i386/i386/tss.h
+i386/i386/user_ldt.c
+i386/i386/user_ldt.h
+i386/i386/vm_param.h
+i386/i386/vm_tuning.h
+i386/i386/xpr.h
+i386/i386/zalloc.h
+i386/i386at/asm_startup.h
+i386/i386at/autoconf.c
+i386/i386at/blit.c
+i386/i386at/blitreg.h
+i386/i386at/blituser.h
+i386/i386at/blitvar.h
+i386/i386at/boothdr.S
+i386/i386at/com.c
+i386/i386at/comreg.h
+i386/i386at/conf.c
+i386/i386at/cram.h
+i386/i386at/cons_conf.c
+i386/i386at/dev_hdr.h
+i386/i386at/device_emul.h
+i386/i386at/disk.h
+i386/i386at/ds8390.h
+i386/i386at/eisa.h
+i386/i386at/fd.c
+i386/i386at/fdreg.h
+i386/i386at/i386at_ds_routines.c
+i386/i386at/i8250.h
+i386/i386at/i82586.h
+i386/i386at/idt.h
+i386/i386at/if_3c501.c
+i386/i386at/lpr.c
+i386/i386at/if_3c501.h
+i386/i386at/if_3c503.h
+i386/i386at/if_ne.c
+i386/i386at/if_de6c.c
+i386/i386at/if_de6c.h
+i386/i386at/if_de6s.S
+i386/i386at/if_nereg.h
+i386/i386at/if_ns8390.c
+i386/i386at/if_ns8390.h
+i386/i386at/if_par.c
+i386/i386at/if_par.h
+i386/i386at/if_pc586.c
+i386/i386at/if_pc586.h
+i386/i386at/if_wd8003.h
+i386/i386at/immc.c
+i386/i386at/int_init.c
+i386/i386at/interrupt.S
+i386/i386at/iopl.c
+i386/i386at/kd.c
+i386/i386at/kd.h
+i386/i386at/kd_event.c
+i386/i386at/kd_mouse.c
+i386/i386at/kd_queue.c
+i386/i386at/kd_queue.h
+i386/i386at/kdasm.S
+i386/i386at/kdsoft.h
+i386/i386at/gpl/if_hpp.c
+i386/i386at/gpl/if_ns.c
+i386/i386at/gpl/if_nsreg.h
+i386/i386at/gpl/if_ul.c
+i386/i386at/gpl/if_wd.c
+i386/i386at/gpl/linux/linux_autoirq.c
+i386/i386at/gpl/linux/linux_block.c
+i386/i386at/gpl/linux/linux_dma.c
+i386/i386at/gpl/linux/linux_emul.h
+i386/i386at/gpl/linux/linux_init.c
+i386/i386at/gpl/linux/linux_irq.c
+i386/i386at/gpl/linux/linux_kmem.c
+i386/i386at/gpl/linux/linux_misc.c
+i386/i386at/gpl/linux/linux_net.c
+i386/i386at/gpl/linux/linux_port.c
+i386/i386at/gpl/linux/linux_printk.c
+i386/i386at/gpl/linux/linux_sched.c
+i386/i386at/gpl/linux/linux_soft.c
+i386/i386at/gpl/linux/linux_timer.c
+i386/i386at/gpl/linux/linux_version.c
+i386/i386at/gpl/linux/linux_vsprintf.c
+i386/i386at/gpl/linux/block/cmd640.c
+i386/i386at/gpl/linux/block/floppy.c
+i386/i386at/gpl/linux/block/genhd.c
+i386/i386at/gpl/linux/block/ide-cd.c
+i386/i386at/gpl/linux/block/ide.c
+i386/i386at/gpl/linux/block/ide.h
+i386/i386at/gpl/linux/block/ide_modes.h
+i386/i386at/gpl/linux/block/rz1000.c
+i386/i386at/gpl/linux/block/triton.c
+i386/i386at/gpl/linux/include/asm/bitops.h
+i386/i386at/gpl/linux/include/asm/byteorder.h
+i386/i386at/gpl/linux/include/asm/delay.h
+i386/i386at/gpl/linux/include/asm/errno.h
+i386/i386at/gpl/linux/include/asm/dma.h
+i386/i386at/gpl/linux/include/asm/fcntl.h
+i386/i386at/gpl/linux/include/asm/floppy.h
+i386/i386at/gpl/linux/include/asm/io.h
+i386/i386at/gpl/linux/include/asm/irq.h
+i386/i386at/gpl/linux/include/asm/ioctl.h
+i386/i386at/gpl/linux/include/asm/page.h
+i386/i386at/gpl/linux/include/asm/param.h
+i386/i386at/gpl/linux/include/asm/processor.h
+i386/i386at/gpl/linux/include/asm/ptrace.h
+i386/i386at/gpl/linux/include/asm/resource.h
+i386/i386at/gpl/linux/include/asm/segment.h
+i386/i386at/gpl/linux/include/asm/sigcontext.h
+i386/i386at/gpl/linux/include/asm/signal.h
+i386/i386at/gpl/linux/include/asm/socket.h
+i386/i386at/gpl/linux/include/asm/stat.h
+i386/i386at/gpl/linux/include/asm/statfs.h
+i386/i386at/gpl/linux/include/asm/string.h
+i386/i386at/gpl/linux/include/asm/system.h
+i386/i386at/gpl/linux/include/asm/termios.h
+i386/i386at/gpl/linux/include/asm/types.h
+i386/i386at/gpl/linux/include/asm/unistd.h
+i386/i386at/gpl/linux/include/linux/autoconf.h
+i386/i386at/gpl/linux/include/linux/binfmts.h
+i386/i386at/gpl/linux/include/linux/bios32.h
+i386/i386at/gpl/linux/include/linux/blk.h
+i386/i386at/gpl/linux/include/linux/blkdev.h
+i386/i386at/gpl/linux/include/linux/cdrom.h
+i386/i386at/gpl/linux/include/linux/config.h
+i386/i386at/gpl/linux/include/linux/delay.h
+i386/i386at/gpl/linux/include/linux/errno.h
+i386/i386at/gpl/linux/include/linux/etherdevice.h
+i386/i386at/gpl/linux/include/linux/fcntl.h
+i386/i386at/gpl/linux/include/linux/fd.h
+i386/i386at/gpl/linux/include/linux/fdreg.h
+i386/i386at/gpl/linux/include/linux/fs.h
+i386/i386at/gpl/linux/include/linux/genhd.h
+i386/i386at/gpl/linux/include/linux/hdreg.h
+i386/i386at/gpl/linux/include/linux/head.h
+i386/i386at/gpl/linux/include/linux/if.h
+i386/i386at/gpl/linux/include/linux/if_arp.h
+i386/i386at/gpl/linux/include/linux/if_ether.h
+i386/i386at/gpl/linux/include/linux/if_tr.h
+i386/i386at/gpl/linux/include/linux/igmp.h
+i386/i386at/gpl/linux/include/linux/in.h
+i386/i386at/gpl/linux/include/linux/interrupt.h
+i386/i386at/gpl/linux/include/linux/inet.h
+i386/i386at/gpl/linux/include/linux/ioctl.h
+i386/i386at/gpl/linux/include/linux/ioport.h
+i386/i386at/gpl/linux/include/linux/ip.h
+i386/i386at/gpl/linux/include/linux/ipc.h
+i386/i386at/gpl/linux/include/linux/kdev_t.h
+i386/i386at/gpl/linux/include/linux/kernel.h
+i386/i386at/gpl/linux/include/linux/kernel_stat.h
+i386/i386at/gpl/linux/include/linux/limits.h
+i386/i386at/gpl/linux/include/linux/linkage.h
+i386/i386at/gpl/linux/include/linux/locks.h
+i386/i386at/gpl/linux/include/linux/major.h
+i386/i386at/gpl/linux/include/linux/malloc.h
+i386/i386at/gpl/linux/include/linux/math_emu.h
+i386/i386at/gpl/linux/include/linux/mc146818rtc.h
+i386/i386at/gpl/linux/include/linux/minix_fs.h
+i386/i386at/gpl/linux/include/linux/minix_fs_sb.h
+i386/i386at/gpl/linux/include/linux/mm.h
+i386/i386at/gpl/linux/include/linux/module.h
+i386/i386at/gpl/linux/include/linux/net.h
+i386/i386at/gpl/linux/include/linux/mount.h
+i386/i386at/gpl/linux/include/linux/netdevice.h
+i386/i386at/gpl/linux/include/linux/nfs.h
+i386/i386at/gpl/linux/include/linux/notifier.h
+i386/i386at/gpl/linux/include/linux/pagemap.h
+i386/i386at/gpl/linux/include/linux/param.h
+i386/i386at/gpl/linux/include/linux/pci.h
+i386/i386at/gpl/linux/include/linux/personality.h
+i386/i386at/gpl/linux/include/linux/proc_fs.h
+i386/i386at/gpl/linux/include/linux/ptrace.h
+i386/i386at/gpl/linux/include/linux/resource.h
+i386/i386at/gpl/linux/include/linux/quota.h
+i386/i386at/gpl/linux/include/linux/route.h
+i386/i386at/gpl/linux/include/linux/sched.h
+i386/i386at/gpl/linux/include/linux/scsicam.h
+i386/i386at/gpl/linux/include/linux/scsi.h
+i386/i386at/gpl/linux/include/linux/sem.h
+i386/i386at/gpl/linux/include/linux/signal.h
+i386/i386at/gpl/linux/include/linux/skbuff.h
+i386/i386at/gpl/linux/include/linux/smp.h
+i386/i386at/gpl/linux/include/linux/socket.h
+i386/i386at/gpl/linux/include/linux/sockios.h
+i386/i386at/gpl/linux/include/linux/stat.h
+i386/i386at/gpl/linux/include/linux/stddef.h
+i386/i386at/gpl/linux/include/linux/string.h
+i386/i386at/gpl/linux/include/linux/tasks.h
+i386/i386at/gpl/linux/include/linux/tcp.h
+i386/i386at/gpl/linux/include/linux/termios.h
+i386/i386at/gpl/linux/include/linux/time.h
+i386/i386at/gpl/linux/include/linux/timer.h
+i386/i386at/gpl/linux/include/linux/tqueue.h
+i386/i386at/gpl/linux/include/linux/trdevice.h
+i386/i386at/gpl/linux/include/linux/tty.h
+i386/i386at/gpl/linux/include/linux/tty_driver.h
+i386/i386at/gpl/linux/include/linux/tty_ldisc.h
+i386/i386at/gpl/linux/include/linux/types.h
+i386/i386at/gpl/linux/include/linux/uio.h
+i386/i386at/gpl/linux/include/linux/unistd.h
+i386/i386at/gpl/linux/include/linux/utsname.h
+i386/i386at/gpl/linux/include/linux/version.h
+i386/i386at/gpl/linux/include/linux/vfs.h
+i386/i386at/gpl/linux/include/linux/vm86.h
+i386/i386at/gpl/linux/include/linux/wait.h
+i386/i386at/gpl/linux/include/net/af_unix.h
+i386/i386at/gpl/linux/include/net/arp.h
+i386/i386at/gpl/linux/include/net/atalkcall.h
+i386/i386at/gpl/linux/include/net/ax25.h
+i386/i386at/gpl/linux/include/net/ax25call.h
+i386/i386at/gpl/linux/include/net/checksum.h
+i386/i386at/gpl/linux/include/net/datalink.h
+i386/i386at/gpl/linux/include/net/icmp.h
+i386/i386at/gpl/linux/include/net/ip.h
+i386/i386at/gpl/linux/include/net/ip_alias.h
+i386/i386at/gpl/linux/include/net/ip_forward.h
+i386/i386at/gpl/linux/include/net/ipip.h
+i386/i386at/gpl/linux/include/net/ipx.h
+i386/i386at/gpl/linux/include/net/ipxcall.h
+i386/i386at/gpl/linux/include/net/netlink.h
+i386/i386at/gpl/linux/include/net/netrom.h
+i386/i386at/gpl/linux/include/net/nrcall.h
+i386/i386at/gpl/linux/include/net/p8022.h
+i386/i386at/gpl/linux/include/net/p8022call.h
+i386/i386at/gpl/linux/include/net/protocol.h
+i386/i386at/gpl/linux/include/net/psnap.h
+i386/i386at/gpl/linux/include/net/psnapcall.h
+i386/i386at/gpl/linux/include/net/rarp.h
+i386/i386at/gpl/linux/include/net/raw.h
+i386/i386at/gpl/linux/include/net/route.h
+i386/i386at/gpl/linux/include/net/slhc.h
+i386/i386at/gpl/linux/include/net/snmp.h
+i386/i386at/gpl/linux/include/net/sock.h
+i386/i386at/gpl/linux/include/net/tcp.h
+i386/i386at/gpl/linux/include/net/udp.h
+i386/i386at/gpl/linux/net/3c501.c
+i386/i386at/gpl/linux/net/3c503.c
+i386/i386at/gpl/linux/net/3c503.h
+i386/i386at/gpl/linux/net/3c505.c
+i386/i386at/gpl/linux/net/3c505.h
+i386/i386at/gpl/linux/net/3c507.c
+i386/i386at/gpl/linux/net/3c509.c
+i386/i386at/gpl/linux/net/3c59x.c
+i386/i386at/gpl/linux/net/8390.c
+i386/i386at/gpl/linux/net/8390.h
+i386/i386at/gpl/linux/net/Space.c
+i386/i386at/gpl/linux/net/ac3200.c
+i386/i386at/gpl/linux/net/apricot.c
+i386/i386at/gpl/linux/net/at1700.c
+i386/i386at/gpl/linux/net/atp.c
+i386/i386at/gpl/linux/net/atp.h
+i386/i386at/gpl/linux/net/de4x5.c
+i386/i386at/gpl/linux/net/de4x5.h
+i386/i386at/gpl/linux/net/de620.h
+i386/i386at/gpl/linux/net/de600.c
+i386/i386at/gpl/linux/net/de620.c
+i386/i386at/gpl/linux/net/depca.c
+i386/i386at/gpl/linux/net/depca.h
+i386/i386at/gpl/linux/net/dev.c
+i386/i386at/gpl/linux/net/e2100.c
+i386/i386at/gpl/linux/net/eepro.c
+i386/i386at/gpl/linux/net/eexpress.c
+i386/i386at/gpl/linux/net/eth16i.c
+i386/i386at/gpl/linux/net/ewrk3.c
+i386/i386at/gpl/linux/net/ewrk3.h
+i386/i386at/gpl/linux/net/hp-plus.c
+i386/i386at/gpl/linux/net/hp.c
+i386/i386at/gpl/linux/net/hp100.c
+i386/i386at/gpl/linux/net/hp100.h
+i386/i386at/gpl/linux/net/i82586.h
+i386/i386at/gpl/linux/net/iow.h
+i386/i386at/gpl/linux/net/lance.c
+i386/i386at/gpl/linux/net/ne.c
+i386/i386at/gpl/linux/net/net_init.c
+i386/i386at/gpl/linux/net/ni52.c
+i386/i386at/gpl/linux/net/ni52.h
+i386/i386at/gpl/linux/net/ni65.c
+i386/i386at/gpl/linux/net/ni65.h
+i386/i386at/gpl/linux/net/seeq8005.c
+i386/i386at/gpl/linux/net/seeq8005.h
+i386/i386at/gpl/linux/net/smc-ultra.c
+i386/i386at/gpl/linux/net/sk_g16.c
+i386/i386at/gpl/linux/net/sk_g16.h
+i386/i386at/gpl/linux/net/tulip.c
+i386/i386at/gpl/linux/net/wavelan.c
+i386/i386at/gpl/linux/net/wavelan.h
+i386/i386at/gpl/linux/net/wd.c
+i386/i386at/gpl/linux/net/znet.c
+i386/i386at/gpl/linux/pci/bios32.c
+i386/i386at/gpl/linux/pci/pci.c
+i386/i386at/gpl/linux/scsi/53c7,8xx.c
+i386/i386at/gpl/linux/scsi/53c7,8xx.h
+i386/i386at/gpl/linux/scsi/53c8xx_d.h
+i386/i386at/gpl/linux/scsi/53c8xx_u.h
+i386/i386at/gpl/linux/scsi/BusLogic.c
+i386/i386at/gpl/linux/scsi/AM53C974.c
+i386/i386at/gpl/linux/scsi/AM53C974.h
+i386/i386at/gpl/linux/scsi/BusLogic.h
+i386/i386at/gpl/linux/scsi/constants.c
+i386/i386at/gpl/linux/scsi/NCR5380.h
+i386/i386at/gpl/linux/scsi/NCR5380.src
+i386/i386at/gpl/linux/scsi/NCR53c406a.c
+i386/i386at/gpl/linux/scsi/NCR53c406a.h
+i386/i386at/gpl/linux/scsi/advansys.c
+i386/i386at/gpl/linux/scsi/advansys.h
+i386/i386at/gpl/linux/scsi/aha152x.c
+i386/i386at/gpl/linux/scsi/aha152x.h
+i386/i386at/gpl/linux/scsi/aha1542.c
+i386/i386at/gpl/linux/scsi/aha1542.h
+i386/i386at/gpl/linux/scsi/aha1740.c
+i386/i386at/gpl/linux/scsi/aha1740.h
+i386/i386at/gpl/linux/scsi/aic7xxx.c
+i386/i386at/gpl/linux/scsi/aic7xxx.h
+i386/i386at/gpl/linux/scsi/aic7xxx_proc.src
+i386/i386at/gpl/linux/scsi/aic7xxx_reg.h
+i386/i386at/gpl/linux/scsi/aic7xxx_seq.h
+i386/i386at/gpl/linux/scsi/constants.h
+i386/i386at/gpl/linux/scsi/eata.c
+i386/i386at/gpl/linux/scsi/eata.h
+i386/i386at/gpl/linux/scsi/eata_dma.c
+i386/i386at/gpl/linux/scsi/eata_dma.h
+i386/i386at/gpl/linux/scsi/eata_dma_proc.h
+i386/i386at/gpl/linux/scsi/eata_dma_proc.src
+i386/i386at/gpl/linux/scsi/eata_generic.h
+i386/i386at/gpl/linux/scsi/eata_pio.c
+i386/i386at/gpl/linux/scsi/eata_pio.h
+i386/i386at/gpl/linux/scsi/eata_pio_proc.src
+i386/i386at/gpl/linux/scsi/in2000.c
+i386/i386at/gpl/linux/scsi/fdomain.c
+i386/i386at/gpl/linux/scsi/fdomain.h
+i386/i386at/gpl/linux/scsi/g_NCR5380.c
+i386/i386at/gpl/linux/scsi/g_NCR5380.h
+i386/i386at/gpl/linux/scsi/hosts.c
+i386/i386at/gpl/linux/scsi/hosts.h
+i386/i386at/gpl/linux/scsi/pas16.c
+i386/i386at/gpl/linux/scsi/in2000.h
+i386/i386at/gpl/linux/scsi/pas16.h
+i386/i386at/gpl/linux/scsi/qlogic.c
+i386/i386at/gpl/linux/scsi/qlogic.h
+i386/i386at/gpl/linux/scsi/scsi.h
+i386/i386at/gpl/linux/scsi/scsi.c
+i386/i386at/gpl/linux/scsi/scsi_proc.c
+i386/i386at/gpl/linux/scsi/scsi_debug.c
+i386/i386at/gpl/linux/scsi/scsi_debug.h
+i386/i386at/gpl/linux/scsi/scsi_ioctl.c
+i386/i386at/gpl/linux/scsi/scsi_ioctl.h
+i386/i386at/gpl/linux/scsi/scsicam.c
+i386/i386at/gpl/linux/scsi/sd_ioctl.c
+i386/i386at/gpl/linux/scsi/sd.c
+i386/i386at/gpl/linux/scsi/sd.h
+i386/i386at/gpl/linux/scsi/seagate.c
+i386/i386at/gpl/linux/scsi/seagate.h
+i386/i386at/gpl/linux/scsi/sr.c
+i386/i386at/gpl/linux/scsi/sr.h
+i386/i386at/gpl/linux/scsi/sr_ioctl.c
+i386/i386at/gpl/linux/scsi/u14-34f.c
+i386/i386at/gpl/linux/scsi/t128.c
+i386/i386at/gpl/linux/scsi/t128.h
+i386/i386at/gpl/linux/scsi/u14-34f.h
+i386/i386at/gpl/linux/scsi/ultrastor.c
+i386/i386at/gpl/linux/scsi/ultrastor.h
+i386/i386at/gpl/linux/scsi/wd7000.c
+i386/i386at/gpl/linux/scsi/wd7000.h
+i386/i386at/lprreg.h
+i386/i386at/model_dep.c
+i386/i386at/nfd.c
+i386/i386at/nfdreg.h
+i386/i386at/nhd.c
+i386/i386at/nhdreg.h
+i386/i386at/phys_mem_grab_page.c
+i386/i386at/pic_isa.c
+i386/i386at/rtc.c
+i386/i386at/rtc.h
+i386/imps/Makefile.in
+i386/imps/apic.h
+i386/imps/cpu_number.h
+i386/imps/cpus.h
+i386/imps/imps.c
+i386/imps/impsasm.sym
+i386/include/Makefile.in
+i386/include/Makerules
+i386/include/mach/proc_ops.h
+i386/include/mach/setjmp.h
+i386/include/mach/machine
+i386/include/mach/sa/stdarg.h
+i386/include/mach/sa/sys/varargs.h
+i386/include/mach/i386/asm.h
+i386/include/mach/i386/bios.h
+i386/include/mach/i386/boolean.h
+i386/include/mach/i386/code16.h
+i386/include/mach/i386/cthreads.h
+i386/include/mach/i386/debug_reg.h
+i386/include/mach/i386/disk.h
+i386/include/mach/i386/dpmi.h
+i386/include/mach/i386/eflags.h
+i386/include/mach/i386/exception.h
+i386/include/mach/i386/far_ptr.h
+i386/include/mach/i386/fp_reg.h
+i386/include/mach/i386/ioccom.h
+i386/include/mach/i386/kern_return.h
+i386/include/mach/i386/mach_i386.defs
+i386/include/mach/i386/mach_i386_types.h
+i386/include/mach/i386/machine_types.defs
+i386/include/mach/i386/multiboot.h
+i386/include/mach/i386/paging.h
+i386/include/mach/i386/pio.h
+i386/include/mach/i386/pmode.h
+i386/include/mach/i386/proc_reg.h
+i386/include/mach/i386/rpc.h
+i386/include/mach/i386/seg.h
+i386/include/mach/i386/syscall_sw.h
+i386/include/mach/i386/thread_status.h
+i386/include/mach/i386/time_stamp.h
+i386/include/mach/i386/trap.h
+i386/include/mach/i386/tss.h
+i386/include/mach/i386/vcpi.h
+i386/include/mach/i386/vm_param.h
+i386/include/mach/i386/vm_types.h
+i386/include/mach/i386/exec/elf.h
+i386/intel/pmap.c
+i386/intel/pmap.h
+i386/intel/read_fault.c
+i386/pc/Makerules
+i386/pc/NOTES
+i386/pc/debug.h
+i386/pc/exit.c
+i386/pc/gdt.h
+i386/pc/gdt_sels.h
+i386/pc/ipl.h
+i386/pc/irq.h
+i386/pc/irq_list.h
+i386/pc/pc_asm.sym
+i386/pc/phys_mem.h
+i386/pc/phys_mem_add.c
+i386/pc/pic.c
+i386/pc/pic.h
+i386/pc/putchar.c
+i386/pc/real.h
+i386/pc/real_tss.c
+i386/pc/real_tss.h
+i386/pc/real_tss_def.S
+i386/pc/i16/i16_a20.c
+i386/pc/i16/i16_a20.h
+i386/pc/i16/i16_bios.h
+i386/pc/i16/i16_exit.c
+i386/pc/i16/i16_ext_mem.c
+i386/pc/i16/i16_init.c
+i386/pc/i16/i16_main.c
+i386/pc/i16/i16_pic.c
+i386/pc/i16/i16_putchar.c
+i386/pc/i16/i16_raw.c
+i386/pc/i16/i16_raw_test_a20.S
+i386/pc/i16/i16_real_int.S
+i386/pc/i16/i16_switch.h
+i386/pc/i16/phys_mem_collect.c
+i386/pc/i16/phys_mem_sources.h
+i386/pc/i16/raw_exit.c
+i386/pc/i16/raw_real_int.c
+i386/pc/rv86/config.h
+i386/pc/rv86/gdt_sels.h
+i386/pc/rv86/idt_irq_init.c
+i386/pc/rv86/rv86_real_int.c
+i386/pc/rv86/rv86_real_int_asm.S
+i386/pc/rv86/rv86_reflect_irq.S
+i386/pc/rv86/rv86_trap_handler.S
+i386/pc/rv86/trap_handler.S
+i386/util/Makerules
+i386/util/NOTES
+i386/util/anno.c
+i386/util/anno.h
+i386/util/cpu.h
+i386/util/cpu_subs.h
+i386/util/cpu_tables_init.c
+i386/util/cpu_tables_load.c
+i386/util/crtn.S
+i386/util/debug.h
+i386/util/gdt.c
+i386/util/gdt.h
+i386/util/gdt_sels.h
+i386/util/i386_asm.sym
+i386/util/idt.c
+i386/util/idt.h
+i386/util/idt_inittab.S
+i386/util/idt_inittab.h
+i386/util/ldt.h
+i386/util/trap.h
+i386/util/trap_asm.sym
+i386/util/trap_dump.c
+i386/util/trap_dump_die.c
+i386/util/trap_handler.S
+i386/util/trap_return.S
+i386/util/tss.c
+i386/util/tss.h
+i386/util/tss_dump.c
+i386/util/vm_param.h
+i386/util/i16/debug.h
+i386/util/i16/i16.h
+i386/util/i16/i16_die.c
+i386/util/i16/i16_gdt_init_temp.c
+i386/util/i16/i16_nanodelay.c
+i386/util/i16/i16_puts.c
+i386/util/i16/i16_writehex.c
+i386/Files
+i386/README-Drivers
+i386/Drivers.in
+i386/driverlist.in
+i386/configure
+i386/device-drivers.h.in
+i386/Subdirs
diff --git a/i386/Makefrag b/i386/Makefrag
index 23f5e85..fcab470 100644
--- a/i386/Makefrag
+++ b/i386/Makefrag
@@ -7,16 +7,18 @@
 DEFINES += -DCONTINUATIONS -DLINUX_DEV -D__ELF__ -Di386
 
 # Source files for any i386 kernel
-i386at-files = autoconf.c blit.c com.c conf.c cons_conf.c fd.c \
+i386at-files = autoconf.c blit.c conf.c cons_conf.c fd.c rtc.c \
 	i386at_ds_routines.c immc.c int_init.c iopl.c kd.c kd_event.c \
-	kd_mouse.c kd_queue.c lpr.c model_dep.c nfd.c nhd.c \
-	phys_mem_grab_page.c pic_isa.c rtc.c
+	kd_mouse.c kd_queue.c model_dep.c phys_mem_grab_page.c pic_isa.c
 i386-files = ast_check.c db_disasm.c db_interface.c db_trace.c debug_i386.c \
 	fpe_linkage.c fpu.c gdt.c hardclock.c idt.c io_emulate.c io_map.c \
 	iopb.c ktss.c kttd_interface.c ldt.c loose_ends.c mp_desc.c pcb.c \
 	phys.c pic.c pit.c seg.c trap.c user_ldt.c
 intel-files = pmap.c read_fault.c
 
+# Drivers; not used in all kernel, but only if selected.
+driver-files= com.c
+
 # Assembler source
 i386at-Sfiles = boothdr.S interrupt.S kdasm.S
 i386-Sfiles = cswitch.S debug_trace.S idt_inittab.S locore.S spl.S
@@ -39,9 +41,6 @@ objfiles += mach_i386_server.o
 
 ### Linux device drivers (make this Better, Please)
 
-# instead of Mach's KERNEL, Linux uses __KERNEL__.  Whee.
-DEFINES += -D__KERNEL__
-
 linux-gen-files = $(addprefix linux_,$(linux-gen-names))
 linux-gen-names = autoirq.c block.c dma.c init.c irq.c kmem.c misc.c net.c \
 		port.c printk.c sched.c soft.c timer.c version.c vsprintf.c
@@ -64,21 +63,53 @@ linux-scsi-files = 53c7,8xx.c AM53C974.c BusLogic.c NCR53c406a.c advansys.c \
 	sd_ioctl.c seagate.c sr.c sr_ioctl.c t128.c u14-34f.c \
 	ultrastor.c wd7000.c
 
-objfiles += $(subst .c,.o,$(linux-gen-files) $(linux-block-files) \
-		$(linux-net-files) $(linux-pci-files) $(linux-scsi-files))
+all-linux-files = $(linux-gen-files) $(linux-block-files) \
+		$(linux-net-files) $(linux-pci-files) $(linux-scsi-files)
+
+# These are always used.
+objfiles += $(subst .c,.o,$(filter-out linux_net.c,$(linux-gen-files)))
+objfiles += $(subst .c,.o,$(linux-pci-files)) genhd.o
+
 vpath %.c $(sysdep)/i386at/gpl/linux $(sysdep)/i386at/gpl/linux/block
 vpath %.c $(sysdep)/i386at/gpl/linux/net $(sysdep)/i386at/gpl/linux/pci
 vpath %.c $(sysdep)/i386at/gpl/linux/scsi
 
+# These files need special flags for compilation; each one will
+# have a variable like wd7000.c-linux-flags with those flags.
+CFLAGS += $($(<F)-linux-flags)
+
+# These flags are:
+# Instead of Mach's KERNEL, Linux uses __KERNEL__.  Whee.
+# Arrange for special include directories too.
 # Because of the use of `extern inline' in some Linux header files without
 # corresponding text-segment definitions, we must always optimize.
-CFLAGS += -O2
+linux-spec-flags= -D__KERNEL__ -I$(sysdep)/i386at/gpl/linux \
+	-I$(sysdep)/i386at/gpl/linux/include -O2
+
+# Here is where those specs are found.
+include linux-flags
+
+# How to make this file:
+
+linux-flags: $(sysdep)/Makefrag
+	rm -f $@
+	for i in $(all-linux-files); do \
+		echo $$i-linux-flags '= $$(linux-spec-flags)' >> $@; \
+	done
+	echo 'linux-flags-done='$(all-linux-files) >> $@
+
+# If we haven't included `linux-flags' properly, then don't try and build
+# .d files.
+ifneq ($(linux-flags-done),$(all-linux-files))
+no_deps=t
+endif
 
 ### End Linux device drivers grot
 
 
-# XXX Temporary
-i386at_ds_routines.o: device_interface.h
+
+include i386/driverlist
+objfiles += $(device_drivers)
 
 
 
@@ -93,10 +124,8 @@ objfiles := boothdr.o $(filter-out boothdr.o,$(objfiles))
 INCLUDES := -I$(sysdep)/i386at -I$(sysdep)/i386 \
 	-I$(sysdep)/include -I$(sysdep)/include/mach/sa \
 	-I$(sysdep)/bogus -I$(sysdep) \
-	-I$(sysdep)/i386at/gpl/linux -I$(sysdep)/i386at/gpl/linux/include \
 	$(INCLUDES)
 
-
 # arrange suitable load address
 LDFLAGS += -Ttext 100000
 
@@ -105,7 +134,25 @@ ASFLAGS += -DASSEMBLER
 
 boothdr.o: i386asm.h 
 
+
+# Header files we install
+
+# We have our own version of this file
+installed-headers := $(filter-out mach/proc_ops.h,$(installed-headers))
+
+i386-installed-headers= mach/proc_ops.h \
+		$(addprefix mach/i386/,asm.h bios.h boolean.h code16.h \
+		debug_reg.h disk.h dpmi.h eflags.h exception.h far_ptr.h \
+		fp_reg.h ioccom.h kern_return.h mach_i386.defs \
+		mach_i386_types.h machine_types.defs multiboot.h paging.h \
+		pio.h pmode.h proc_reg.h rpc.h seg.h syscall_sw.h \
+		thread_status.h time_stamp.h trap.h tss.h vcpi.h vm_param.h \
+		vm_types.h)
+
+
 # Cheat, cheat, cheat.
 fpe.o: fpe.b_elf
 	uudecode $<
 vpath fpe.b_elf $(sysdep)/i386
+
+fpe.d:; touch $@
\ No newline at end of file
diff --git a/i386/README-Drivers b/i386/README-Drivers
new file mode 100644
index 0000000..bb2f521
--- /dev/null
+++ b/i386/README-Drivers
@@ -0,0 +1,299 @@
+Adaptec 1740
+Patch probe routine to add outb to put card in enhanced mode.
+
+-*- text -*-
+
+** Turning on or off device drivers
+
+Each device driver has an associated configure switch.  The table at
+the end of this file gives the list of configure switches.  For many
+devices there are multiple drivers to choose from.  
+
+
+** What the configure switches do
+
+Each configure switch has two effects.  First, it defines a CPP symbol
+that turns on or off the hooks that autoconfigure the device and add
+it to the list of available devices.  Second, it adds the source code
+for the driver to a make variable so that the code for the driver is
+compiled and linked into the kernel.
+
+
+** What are those extra numbers
+
+Each driver is followed by one or more triplets of three numbers.
+These triplets specify combinations of I/O address, spl, and, pic that
+are believed to work. 
+
+
+** Then comes the name of the device to users.  %d is a unit number.
+
+
+***
+
+All source file names are relative to .../gnumach/i386/i386at for Mach
+drivers, and .../gnumach/i386/i386at/gpl/linux for Linux drivers.
+
+
+*** Serial devices and similar equivalents
+
+PC com ports
+  --enable-com				com.c
+	0x3f8,2f8,3e8
+	com%d
+
+System Console (always enabled)
+	(indirect name for kd or first com line)
+	console
+
+PC keyboard/display (always enabled)
+	kd
+
+
+*** Special devices
+
+Mappable time device (always enabled)
+	time
+
+Mouse interface to PC (always enabled)
+	(Piggy backs horribly on COM devices)
+	mouse%d
+
+X Window System interface to keyboard (always enabled)
+	kbd%d
+
+Interface to setting up IO port access for users (always enabled)
+	iopl%d
+
+
+
+*** Disk controllers (except for SCSI)
+
+PC floppy
+  --enable-floppy			block/floppy.c
+	0x3f0, 370
+	fd%d
+
+IDE disks
+  --enable-ide		block/{cmd640,ide-cd,ide,rz1000,triton}.c
+	hd%d	(disks)
+	wcd%d	(cdroms)
+
+
+*** SCSI disks Disks all show up as `sd%d'.  CD Roms all show up as
+`cd%d'.  Tapes and generic are not currently supported.
+
+AdvansSys
+  --enable-advansys		scsi/advansys.c
+
+BusLogic MultiMaster
+  --enable-buslogic		scsi/BusLogic.c
+
+UltraStor 14F/34F
+  --enable-u1434f		scsi/u14-34f.c
+
+UlstraStor 14F, 24F, and 34F
+  --enable-ultrastor		scsi/ultrastor.c
+
+Adaptec AHA-152x
+  --enable-aha152x		scsi/aha152x.c
+
+Adaptec AHA-1542
+  --enable-aha1542		scsi/aha1540.c
+
+Adaptec AHA-1740
+  --enable-aha1740		scsi/aha1740.c
+
+Adaptec AIC7xxx
+  --enable-aic7xxx		scsi/aic7xxx.c
+
+Future Domain TMC-16x0
+  --enable-futuredomain		scsi/fdomain.c
+
+Always IN 2000
+  --enable-in2000		scsi/in2000.c
+
+Generic NCR5380
+  --enable-ncr5380		scsi/g_NCR5380.c
+
+NCR53c406 chip
+  --enable-ncr53c406a		scsi/NCR53c406a.c
+
+Qlogic FAS408
+  --enable-qlogic		scsi/qlogic.c
+
+Pro Audio Spectrum/Studio 16
+  --enable-pas16		scsi/pas16.c
+
+Seagate ST01, ST02, Future Domain TMC-885, TMC-950
+  --enable-seagate		scsi/seagate.c
+
+Trantor T128, T128F, T228
+  --enable-t128			scsi/t128.c
+
+NCR 53C7xx
+  --enable-ncr53c7xx		scsi/53c7,8xx.c
+
+EATA DMA
+  --enable-eatadma		scsi/eata_dma.c
+
+EATA PIO
+  --enable-eatapio		scsi/eata_pio.c
+
+WD 7000
+  --enable-wd7000		scsi/wd7000.c
+
+EATA
+  --enable-eata			scsi/eata.c
+
+AM52/79C974
+  --enable-am53c974		scsi/AM53C974.c
+
+
+
+*** Ethernet controllers
+These all show up as `eth%d' except the atp device.
+
+NE2000
+  --enable-ne2000			net/ne.c 8390.c
+	0x300,280,320,340,360
+
+3Com 503 (Etherlink II)
+  --enable-3c503			net/3c503.c net/8390.c
+  --enable-el2
+	0x300,310,330,350,250,280,2a0,2e0
+
+3Com 509 (Etherlink III)
+  --enable-3c509			net/3c509.c 
+  --enable-el3
+
+Western Digital 8003E
+  --enable-wd80x3			net/wd.c, net/8390.c
+	0x300,280,380,240
+
+3COM Etherlink 3C501
+  --enable-3c501			net/3c501.c
+  --enable-el1
+	0x280, 300
+
+SMC Ultra
+  --enable-ul				net/smc-ultra.c net/8390.c
+	0x200,220,240,280,300,340,380
+
+Hewlett Packard PC LAN 27??? plus ethercards.
+  --enable-hplanplus			net/hp-plus.c
+	0x200,240,280,2c0,300,320,340
+
+Hewlett Packard PC Lan 
+  --enable-hplan			net/hp.c, net/8390.c
+	0x300,320,340,280,2c0,200,240
+
+3Com 3c590/3c595 Vortex
+  --enable-3c59x
+  --enable-vortex			net/3c59x.c
+
+Seeq 8005
+  --enable-seeq8005			net/seeq8005.c
+	0x300,320,340,360
+
+Hewlett Packard HP10/100 cards		net/hp100.c
+  --enable-hp100
+  --enable-hpj2577
+  --enable-hpj2573
+  --enable-hp27248b
+  --enable-hp2585
+
+Ansel Communications EISA 3200
+  --enable-ac3200			net/ac3200.c, net/8390.c
+
+Cabletron E2100 series
+  --enable-e2100			net/e2100.c, net/8390.c
+	0x300,280,380,220
+
+Allied Telesis AT1700
+  --enable-at1700			net/at1700.c
+	0x260,280,2a0,240,340,320,380,300
+
+ECL EtherTeam 16i and 32 EISA
+  --enable-eth16i			net/eth16i.c 
+  --enable-eth32
+	0x260,280,2a0,240,340,320,380,300 (16i)
+
+Zenith Z-Note (and some IBM thinkpads)
+  --enable-znet				net/znet.c
+  --enable-znote
+
+Intel EtherExpress
+  --enable-eexpress			net/eexpress.c
+	0x300,270,320,340
+
+Intel EtherExpress Pro/10
+  --enable-eexpresspro			net/eepro.c
+	0x200,240,280,2c0,300,320,340,360
+
+Digital DEPCA and EtherWORKS
+  (DEPCA, DE10[01], DE20[012] Turbo, DE210, DE422)
+  --enable-depca			net/depca.c
+  --enable-de100
+  --enable-de101
+  --enable-de200
+  --enable-de201
+  --enable-de202
+  --enable-de210
+  --enable-de422
+
+EtherWORKS 3 Driver
+  (DE20[345])
+  --enable-ewrk3			net/ewrk3.c
+  --enable-de203
+  --enable-de204
+  --enable-de205
+
+Digital DE 400 series cards: DE425, DE43[45], DE500
+  --enable-de4x5			net/de4x5.c
+  --enable-de425
+  --enable-de434
+  --enable-de435
+  --enable-de500
+
+Apricot 82596
+  --enable-apricot			net/apricot.c
+
+AT&T GIS (NCR) WaveLAN
+  --enable-wavelan			net/wavelan.c
+	0x390
+
+3Com 507 EtherLink16
+  --enable-3c507			net/3c507.c
+  --enable-el16
+	0x300,320,340,280
+
+3Com 505 Etherlink Plus
+  --enable-3c505			net/3c505.c
+  --enable-elplus
+	0x300,280,310
+
+D-Link DE-600
+  --enable-de600			net/de600.c
+	0x378
+
+D-Link DE-620
+  --enable-de620			net/de620.c
+	0x378
+
+Schneider & Koch G16
+  --enable-skg16			net/sk_g16.c
+	0x100,180,208,220,288,320,328,390
+
+NI5210
+  --enable-ni52				net/ni52.c
+	0x300,280,360,320,340
+
+NI6510
+  --enable-ni65				net/ni65.c
+	0x300/320/340/360
+
+Run-time ATtachable (Pocket) ethernet driver
+  --enable-atp				net/atp.c
+	0x378,278,3bc
+	atp%d
diff --git a/i386/Subdirs b/i386/Subdirs
new file mode 100644
index 0000000..7f05b6e
--- /dev/null
+++ b/i386/Subdirs
@@ -0,0 +1,31 @@
+i386/aux
+i386/bogus
+i386/chips
+i386/dos
+i386/dos/i16
+i386/i386
+i386/i386at
+i386/i386at/gpl
+i386/i386at/gpl/linux
+i386/i386at/gpl/linux/block
+i386/i386at/gpl/linux/include
+i386/i386at/gpl/linux/include/asm
+i386/i386at/gpl/linux/include/linux
+i386/i386at/gpl/linux/include/net
+i386/i386at/gpl/linux/net
+i386/i386at/gpl/linux/pci
+i386/i386at/gpl/linux/scsi
+i386/i386at/boot
+i386/imps
+i386/include
+i386/include/mach
+i386/include/mach/sa
+i386/include/mach/sa/sys
+i386/include/mach/i386
+i386/include/mach/i386/exec
+i386/intel
+i386/pc
+i386/pc/i16
+i386/pc/rv86
+i386/util
+i386/util/i16
diff --git a/i386/bogus/com.h b/i386/bogus/com.h
index 11832d4..ec56981 100644
--- a/i386/bogus/com.h
+++ b/i386/bogus/com.h
@@ -1 +1,7 @@
+#include <i386/device-drivers.h>
+
+#ifdef CONFIG_MACH_COM
 #define NCOM 4
+#else
+#define NCOM 0
+#endif
diff --git a/i386/device-drivers.h.in b/i386/device-drivers.h.in
new file mode 100644
index 0000000..f09fe08
--- /dev/null
+++ b/i386/device-drivers.h.in
@@ -0,0 +1,59 @@
+/* All possible device drivers; must match Drivers.in. */
+
+#undef CONFIG_SCSI
+#undef CONFIG_INET
+#undef CONFIG_MACH_COM
+#undef CONFIG_BLK_DEV_FD
+#undef CONFIG_BLK_DEV_IDE
+#undef CONFIG_SCSI_ADVANSYS
+#undef CONFIG_SCSI_BUSLOGIC
+#undef CONFIG_SCSI_U14_34F
+#undef CONFIG_SCSI_ULTRASTOR
+#undef CONFIG_SCSI_AHA152X
+#undef CONFIG_SCSI_AHA1542
+#undef CONFIG_SCSI_AHA1740
+#undef CONFIG_SCSI_AIC7XXX
+#undef CONFIG_SCSI_FUTURE_DOMAIN
+#undef CONFIG_SCSI_IN2000
+#undef CONFIG_SCSI_GENERIC_NCR5380
+#undef CONFIG_SCSI_NCR53C406A
+#undef CONFIG_SCSI_QLOGIC
+#undef CONFIG_SCSI_PASS16
+#undef CONFIG_SCSI_SEAGATE
+#undef CONFIG_SCSI_T128
+#undef CONFIG_SCSI_NCR53C7xx
+#undef CONFIG_SCSI_EATA_DMA
+#undef CONFIG_SCSI_EATA_PIO
+#undef CONFIG_SCSI_7000FASST
+#undef CONFIG_SCSI_EATA
+#undef CONFIG_SCSI_AM53C974
+#undef CONFIG_NE2000
+#undef CONFIG_EL2
+#undef CONFIG_WD80x3
+#undef CONFIG_EL1
+#undef CONFIG_ULTRA
+#undef CONFIG_HPLAN_plus
+#undef CONFIG_HPLAN
+#undef CONFIG_VORTEX
+#undef CONFIG_SEEQ8005
+#undef CONFIG_HP100
+#undef CONFIG_AC3200
+#undef CONFIG_E2100
+#undef CONFIG_AT1700
+#undef CONFIG_ETH16I
+#undef CONFIG_ZNET
+#undef CONFIG_EEXPRESS
+#undef CONFIG_EEXPRESS_PRO
+#undef CONFIG_DEPCA
+#undef CONFIG_EWRK3
+#undef CONFIG_DE4X5
+#undef CONFIG_APRICOT
+#undef CONFIG_WAVELAN
+#undef CONFIG_EL16
+#undef CONFIG_ELPLUS
+#undef CONFIG_DE600
+#undef CONFIG_DE620
+#undef CONFIG_SK_G16
+#undef CONFIG_NI52
+#undef CONFIG_NI65
+#undef CONFIG_ATP
diff --git a/i386/driverlist.in b/i386/driverlist.in
new file mode 100644
index 0000000..b1d5f8f
--- /dev/null
+++ b/i386/driverlist.in
@@ -0,0 +1 @@
+device_drivers = @device_drivers@
diff --git a/i386/i386/locore.S b/i386/i386/locore.S
index 8bc5d5e..75f20b0 100644
--- a/i386/i386/locore.S
+++ b/i386/i386/locore.S
@@ -1705,9 +1705,12 @@ tenmicroloop:
  * cpu_shutdown()
  * Force reboot
  */
+null_idt:	
+	.space	8 * 32
+		
 null_idtr:
-        .word   0
-        .long   0
+        .word   8 * 32 - 1
+        .long   null_idt
 
 Entry(cpu_shutdown)
         lidt    null_idtr       /* disable the interrupt handler */
diff --git a/i386/i386/pit.c b/i386/i386/pit.c
index 3ae1487..d0f3f9c 100644
--- a/i386/i386/pit.c
+++ b/i386/i386/pit.c
@@ -144,8 +144,8 @@ findspeed()
 	 */
         /* we arrange calculation so that it doesn't overflow */
         delaycount = ((COUNT/1000) * CLKNUM) / (0xffff-leftover);
-        printf("findspeed: delaycount=%d (tics=%d)\n",
-	       delaycount, (0xffff-leftover));
+	/*        printf("findspeed: delaycount=%d (tics=%d)\n",
+	       delaycount, (0xffff-leftover));*/
 	splon(s);         /* restore interrupt state */
 }
 
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index 113387f..6d7972d 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -173,7 +173,7 @@ comprobe_general(struct bus_device *dev, int noisy)
 int
 comprobe(int port, struct bus_device *dev)
 {
-	return comprobe_general(dev, /*noisy*/ 1);
+	return comprobe_general(dev, /*noisy*/ 0);
 }
 
 #if RCLINE >= 0
diff --git a/i386/i386at/gpl/linux/block/genhd.c b/i386/i386at/gpl/linux/block/genhd.c
index 60cba6c..cebc7ea 100644
--- a/i386/i386at/gpl/linux/block/genhd.c
+++ b/i386/i386at/gpl/linux/block/genhd.c
@@ -88,7 +88,7 @@ static void add_partition (struct gendisk *hd, int minor, int start, int size)
 {
 	hd->part[minor].start_sect = start;
 	hd->part[minor].nr_sects   = size;
-	print_minor_name(hd, minor);
+	/*	print_minor_name(hd, minor);*/
 }
 
 static inline int is_extended_partition(struct partition *p)
@@ -301,7 +301,7 @@ check_table:
 			continue;
 		add_partition(hd, minor, first_sector+START_SECT(p), NR_SECTS(p));
 		if (is_extended_partition(p)) {
-			printk(" <");
+		  /*			printk(" <");*/
 			/*
 			 * If we are rereading the partition table, we need
 			 * to set the size of the partition so that we will
@@ -311,7 +311,7 @@ check_table:
 			hd->sizes[minor] = hd->part[minor].nr_sects 
 			  	>> (BLOCK_SIZE_BITS - 9);
 			extended_partition(hd, MKDEV(hd->major, minor));
-			printk(" >");
+			/*			printk(" >");*/
 			/* prevent someone doing mkfs or mkswap on an
 			   extended partition, but leave room for LILO */
 			if (hd->part[minor].nr_sects > 2)
@@ -332,7 +332,7 @@ check_table:
 			add_partition(hd, current_minor, START_SECT(p), NR_SECTS(p));
 		}
 	}
-	printk("\n");
+	/*	printk("\n");*/
 	brelse(bh);
 	return 1;
 }
@@ -405,7 +405,7 @@ static int osf_partition(struct gendisk *hd, unsigned int dev, unsigned long fir
 				partition->p_size);
 		current_minor++;
 	}
-	printk("\n");
+	/*	printk("\n");*/
 	brelse(bh);
 	return 1;
 }
@@ -475,7 +475,7 @@ static int sun_partition(struct gendisk *hd, unsigned int dev, unsigned long fir
 		add_partition(hd, current_minor, st_sector, p->num_sectors);
 		current_minor++;
 	}
-	printk("\n");
+	/*	printk("\n");*/
 	brelse(bh);
 	return 1;
 }
@@ -487,8 +487,8 @@ static void check_partition(struct gendisk *hd, kdev_t dev)
 	static int first_time = 1;
 	unsigned long first_sector;
 
-	if (first_time)
-		printk("Partition check:\n");
+	/*	if (first_time)
+		printk("Partition check:\n");*/
 	first_time = 0;
 	first_sector = hd->part[MINOR(dev)].start_sect;
 
@@ -501,8 +501,8 @@ static void check_partition(struct gendisk *hd, kdev_t dev)
 		return;
 	}
 
-	printk(" ");
-	print_minor_name(hd, MINOR(dev));
+	/*	printk(" ");
+	print_minor_name(hd, MINOR(dev));*/
 #ifdef CONFIG_MSDOS_PARTITION
 	if (msdos_partition(hd, dev, first_sector))
 		return;
diff --git a/i386/i386at/gpl/linux/block/triton.c b/i386/i386at/gpl/linux/block/triton.c
index 5829661..4f825f6 100644
--- a/i386/i386at/gpl/linux/block/triton.c
+++ b/i386/i386at/gpl/linux/block/triton.c
@@ -341,9 +341,13 @@ static void init_triton_dma (ide_hwif_t *hwif, unsigned short base)
 {
 	static unsigned long dmatable = 0;
 
+#if 0
 	printk("    %s: BusMaster DMA at 0x%04x-0x%04x", hwif->name, base, base+7);
+#endif
 	if (check_region(base, 8)) {
+#if 0
 		printk(" -- ERROR, PORTS ALREADY IN USE");
+#endif
 	} else {
 		request_region(base, 8, "triton DMA");
 		hwif->dma_base = base;
@@ -362,7 +366,9 @@ static void init_triton_dma (ide_hwif_t *hwif, unsigned short base)
 			hwif->dmaproc  = &triton_dmaproc;
 		}
 	}
+#if 0
 	printk("\n");
+#endif
 }
 
 /*
@@ -448,10 +454,12 @@ void ide_init_triton (byte bus, byte fn)
 			continue;
 		s_clks = ((~time >> 12) & 3) + 2;
 		r_clks = ((~time >>  8) & 3) + 1;
+#if 0
 		printk("    %s timing: (0x%04x) sample_CLKs=%d, recovery_CLKs=%d (PIO mode%d)\n",
 		 hwif->name, time, s_clks, r_clks, calc_mode(s_clks+r_clks));
 		print_triton_drive_flags (0, time & 0xf);
 		print_triton_drive_flags (1, (time >> 4) & 0xf);
+#endif
 	}
 
 quit: if (rc) printk("ide: pcibios access failed - %s\n", pcibios_strerror(rc));
diff --git a/i386/i386at/gpl/linux/include/linux/autoconf.h b/i386/i386at/gpl/linux/include/linux/autoconf.h
index 1588347..0d565ae 100644
--- a/i386/i386at/gpl/linux/include/linux/autoconf.h
+++ b/i386/i386at/gpl/linux/include/linux/autoconf.h
@@ -1,8 +1,4 @@
 /*
- * Automatically generated C config: don't edit
- */
-
-/*
  * Loadable module support
  */
 #undef CONFIG_MODULES
@@ -25,11 +21,16 @@
 #undef  CONFIG_M586
 #undef  CONFIG_M686
 
+/* Fetch GNUmach driver config file */
+#include <i386/device-drivers.h>
+
+#if 0				/* these are now in device-drivers.h */
 /*
  * Floppy, IDE, and other block devices
  */
 #define CONFIG_BLK_DEV_FD 1
 #define CONFIG_BLK_DEV_IDE 1
+#endif
 
 /*
  * Please see drivers/block/README.ide for help/info on IDE drives
@@ -46,6 +47,7 @@
 #undef  CONFIG_BLK_DEV_LOOP
 #undef  CONFIG_BLK_DEV_XD
 
+#if 0				/* now in device-drivers.h */
 /*
  * Networking options
  */
@@ -55,6 +57,7 @@
 #undef  CONFIG_IP_FORWARD
 #undef  CONFIG_IP_MULTICAST
 #undef  CONFIG_IP_ACCT
+#endif
 
 /*
  * (it is safe to leave these untouched)
@@ -74,10 +77,12 @@
 #undef  CONFIG_AX25
 #undef  CONFIG_NETLINK
 
+#if 0
 /*
  * SCSI support
  */
 #define CONFIG_SCSI 1
+#endif
 
 /*
  * SCSI support type (disk, tape, CDrom)
@@ -87,6 +92,7 @@
 #define CONFIG_BLK_DEV_SR 1
 #undef  CONFIG_CHR_DEV_SG
 
+#if 0				/* now in device-drivers.h */
 /*
  * Some SCSI devices (e.g. CD jukebox) support multiple LUNs
  */
@@ -118,6 +124,7 @@
 #undef  CONFIG_SCSI_NCR53C406A
 #undef  CONFIG_SCSI_AM53C974
 #define CONFIG_SCSI_NCR53C7xx 1
+#endif
 
 /*
  * Network device support
@@ -129,6 +136,7 @@
 #undef CONFIG_SLIP_SMART
 #undef CONFIG_PPP
 
+#if 0
 /*
  * CCP compressors for PPP are only built as modules.
  */
@@ -164,6 +172,7 @@
  * CD-ROM drivers (not for SCSI or IDE/ATAPI drives)
  */
 #undef  CONFIG_CD_NO_IDESCSI
+#endif
 
 /*
  * Filesystems
@@ -185,6 +194,7 @@
 #undef  CONFIG_HPFS_FS
 #undef  CONFIG_SYSV_FS
 
+#if 0
 /*
  * Character devices
  */
@@ -208,3 +218,4 @@
  * Kernel hacking
  */
 #undef  CONFIG_PROFILE
+#endif
diff --git a/i386/i386at/gpl/linux/linux_block.c b/i386/i386at/gpl/linux/linux_block.c
index e06cc40..d7e335b 100644
--- a/i386/i386at/gpl/linux/linux_block.c
+++ b/i386/i386at/gpl/linux/linux_block.c
@@ -1600,7 +1600,7 @@ check_disk_change (kdev_t dev)
   if (! (*fops->check_media_change) (dev))
     return 0;
 
-  printf ("Disk change detected on device %s\n", kdevname(dev));
+  /*  printf ("Disk change detected on device %s\n", kdevname(dev));*/
 
   if (fops->revalidate)
     (*fops->revalidate) (dev);
@@ -1918,8 +1918,8 @@ find_major:
 	  goto slice_done;
 	}
 
-      printf ("%s: default slice %d: %s OS\n", np->name, slice,
-	      (sysid == UNIXOS ? "Mach" : (sysid == BSDOS ? "BSD" : "LINUX")));
+      /*      printf ("%s: default slice %d: %s OS\n", np->name, slice,
+	      (sysid == UNIXOS ? "Mach" : (sysid == BSDOS ? "BSD" : "LINUX")));*/
 
     slice_done:
       if (ds->fops->release)
@@ -2049,7 +2049,7 @@ find_major:
       dlp = (struct disklabel *) (bhp->b_data + ((LBLLOC << 9) & (bsize - 1)));
       if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC)
 	goto vtoc;
-      printf ("%s: BSD LABEL\n", np->name);
+      /*      printf ("%s: BSD LABEL\n", np->name);*/
       lp->d_npartitions = dlp->d_npartitions;
       memcpy (lp->d_partitions, dlp->d_partitions,
 	      MAXPARTITIONS * sizeof (struct partition));
@@ -2080,7 +2080,7 @@ find_major:
 	  err = D_NO_SUCH_DEVICE;
 	  goto label_done;
 	}
-      printf ("%s: LOCAL LABEL\n", np->name);
+      /*      printf ("%s: LOCAL LABEL\n", np->name);*/
       lp->d_npartitions = (evp->nparts > MAXPARTITIONS
 			   ? MAXPARTITIONS : evp->nparts);
       for (i = 0; i < lp->d_npartitions; i++)
diff --git a/i386/i386at/gpl/linux/linux_init.c b/i386/i386at/gpl/linux/linux_init.c
index d2abae2..4e7b006 100644
--- a/i386/i386at/gpl/linux/linux_init.c
+++ b/i386/i386at/gpl/linux/linux_init.c
@@ -54,6 +54,8 @@
 
 #include <asm/system.h>
 
+#include <i386/device-drivers.h>
+
 /*
  * Set if the machine has an EISA bus.
  */
@@ -230,7 +232,9 @@ linux_init()
 	/*
 	 * Initialize devices.
 	 */
+#ifdef CONFIG_INET
 	linux_net_emulation_init();
+#endif
 	cli();
 	device_setup();
 
@@ -389,7 +393,7 @@ calibrate_delay()
 {
 	int ticks;
 
-	printk("Calibrating delay loop.. ");
+	/*	printk("Calibrating delay loop.. "); */
 	while (loops_per_sec <<= 1) {
 		/* Wait for "start of" clock tick.  */
 		ticks = jiffies;
@@ -402,11 +406,11 @@ calibrate_delay()
 		if (ticks >= hz) {
 			loops_per_sec = muldiv(loops_per_sec,
 						     hz, ticks);
-			printk("ok - %lu.%02lu BogoMips\n",
+			/*printk("ok - %lu.%02lu BogoMips\n",
 			       loops_per_sec / 500000,
-			       (loops_per_sec / 5000) % 100);
+			       (loops_per_sec / 5000) % 100);*/
 			return;
 		}
 	}
-	printk("failed\n");
+/*	printk("failed\n");*/
 }
diff --git a/i386/i386at/gpl/linux/net/8390.c b/i386/i386at/gpl/linux/net/8390.c
index 05ea32f..7962413 100644
--- a/i386/i386at/gpl/linux/net/8390.c
+++ b/i386/i386at/gpl/linux/net/8390.c
@@ -85,7 +85,7 @@ static const char *version =
 #ifdef EI_DEBUG
 int ei_debug = EI_DEBUG;
 #else
-int ei_debug = 1;
+int ei_debug = 0;
 #endif
 #ifdef EI_PINGPONG
 static int ei_pingpong = 1;
diff --git a/i386/i386at/gpl/linux/pci/bios32.c b/i386/i386at/gpl/linux/pci/bios32.c
index e10fdab..f0717fd 100644
--- a/i386/i386at/gpl/linux/pci/bios32.c
+++ b/i386/i386at/gpl/linux/pci/bios32.c
@@ -192,10 +192,12 @@ extern unsigned long check_pcibios(unsigned long memory_start, unsigned long mem
 			if (signature != PCI_SIGNATURE)
 				pcibios_entry = 0;
 		}
+#if 0
 		if (pcibios_entry) {
 			printk ("pcibios_init : PCI BIOS revision %x.%02x entry at 0x%lx\n",
 				major_revision, minor_revision, pcibios_entry);
 		}
+#endif
 	}
 	return memory_start;
 }
@@ -433,13 +435,17 @@ unsigned long pcibios_init(unsigned long memory_start, unsigned long memory_end)
 				check->fields.revision, check);
 			continue;
 		}
+#if 0
 		printk ("pcibios_init : BIOS32 Service Directory structure at 0x%p\n", check);
+#endif
 		if (!bios32_entry) {
 			if (check->fields.entry >= 0x100000) {
 				printk("pcibios_init: entry in high memory, unable to access\n");
 			} else {
 				bios32_indirect.address = bios32_entry = check->fields.entry;
+#if 0
 				printk ("pcibios_init : BIOS32 Service Directory entry at 0x%lx\n", bios32_entry);
+#endif
 			}
 		} else {
 			printk ("pcibios_init : multiple entries, mail drew@colorado.edu\n");
diff --git a/i386/i386at/gpl/linux/pci/pci.c b/i386/i386at/gpl/linux/pci/pci.c
index 03846d0..e5f5979 100644
--- a/i386/i386at/gpl/linux/pci/pci.c
+++ b/i386/i386at/gpl/linux/pci/pci.c
@@ -894,7 +894,9 @@ unsigned long pci_init (unsigned long mem_start, unsigned long mem_end)
 		return mem_start;
 	}
 
+#if 0
 	printk("Probing PCI hardware.\n");
+#endif
 
 	memset(&pci_root, 0, sizeof(pci_root));
 	pci_root.subordinate = scan_bus(&pci_root, &mem_start);
diff --git a/i386/i386at/gpl/linux/scsi/aha1740.c b/i386/i386at/gpl/linux/scsi/aha1740.c
index e3b8f1d..250aa1b 100644
--- a/i386/i386at/gpl/linux/scsi/aha1740.c
+++ b/i386/i386at/gpl/linux/scsi/aha1740.c
@@ -1,4 +1,4 @@
-/*  $Id: aha1740.c,v 1.1.1.1 1997/02/25 21:27:46 thomas Exp $
+/*  $Id: aha1740.c,v 1.2 1997/03/24 21:51:17 thomas Exp $
  *  1993/03/31
  *  linux/kernel/aha1740.c
  *
@@ -56,7 +56,7 @@ struct proc_dir_entry proc_scsi_aha1740 = {
 #endif
 
 /*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/aha1740.c,v 1.1.1.1 1997/02/25 21:27:46 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/aha1740.c,v 1.2 1997/03/24 21:51:17 thomas Exp $";
 */
 
 static unsigned int slot, base;
@@ -166,6 +166,9 @@ int aha1740_test_port(void)
 	return 0;
     }
 
+    /* Try and turn on enhanced mode */
+    tmp = inb (PORTADR);
+    outb (PORTADR, tmp | PORTADDR_ENH);
     if ( inb(PORTADR) & PORTADDR_ENH )
 	return 1;   /* Okay, we're all set */
 	
diff --git a/i386/i386at/gpl/linux/scsi/hosts.c b/i386/i386at/gpl/linux/scsi/hosts.c
index cb0163b..72ae0cb 100644
--- a/i386/i386at/gpl/linux/scsi/hosts.c
+++ b/i386/i386at/gpl/linux/scsi/hosts.c
@@ -134,7 +134,7 @@
 #endif
 
 /*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/hosts.c,v 1.1.1.1 1997/02/25 21:27:49 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/hosts.c,v 1.2 1997/03/24 21:51:24 thomas Exp $";
 */
 
 /*
@@ -387,12 +387,16 @@ unsigned int scsi_init()
 	    name = shpnt->hostt->info(shpnt);
 	else
 	    name = shpnt->hostt->name;
+#if 0
 	printk ("scsi%d : %s\n", /* And print a little message */
 		shpnt->host_no, name);
+#endif
     }
-    
+
+#if 0    
     printk ("scsi : %d host%s.\n", next_scsi_host,
 	    (next_scsi_host == 1) ? "" : "s");
+#endif
     
     scsi_make_blocked_list();
     
diff --git a/i386/i386at/gpl/linux/scsi/scsi.c b/i386/i386at/gpl/linux/scsi/scsi.c
index 85d234e..7b29168 100644
--- a/i386/i386at/gpl/linux/scsi/scsi.c
+++ b/i386/i386at/gpl/linux/scsi/scsi.c
@@ -49,7 +49,7 @@
 #undef USE_STATIC_SCSI_MEMORY
 
 /*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/scsi.c,v 1.1.1.1 1997/02/25 21:27:50 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/scsi.c,v 1.2 1997/03/24 21:51:33 thomas Exp $";
 */
 
 
@@ -2352,12 +2352,14 @@ int scsi_dev_init(void)
     for (shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next)
 	scan_scsis(shpnt,0,0,0,0);           /* scan for scsi devices */
 
+#if 0
     printk("scsi : detected ");
     for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
 	if (sdtpnt->dev_noticed && sdtpnt->name)
 	    printk("%d SCSI %s%s ", sdtpnt->dev_noticed, sdtpnt->name,
 		   (sdtpnt->dev_noticed != 1) ? "s" : "");
     printk("total.\n");
+#endif
     
     for(sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
 	if(sdtpnt->init && sdtpnt->dev_noticed) (*sdtpnt->init)();
diff --git a/i386/i386at/i386at_ds_routines.c b/i386/i386at/i386at_ds_routines.c
index b1375af..b67aa9e 100644
--- a/i386/i386at/i386at_ds_routines.c
+++ b/i386/i386at/i386at_ds_routines.c
@@ -35,20 +35,25 @@
 
 #include <i386at/dev_hdr.h>
 #include <i386at/device_emul.h>
+#include <i386/device-drivers.h>
 
 extern struct device_emulation_ops mach_device_emulation_ops;
 #ifdef LINUX_DEV
 extern struct device_emulation_ops linux_block_emulation_ops;
+#ifdef CONFIG_INET
 extern struct device_emulation_ops linux_net_emulation_ops;
 #endif
+#endif
 
 /* List of emulations.  */
 static struct device_emulation_ops *emulation_list[] =
 {
 #ifdef LINUX_DEV
   &linux_block_emulation_ops,
+#ifdef CONFIG_INET
   &linux_net_emulation_ops,
 #endif
+#endif
   &mach_device_emulation_ops,
 };
 
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 6c41ec5..906fdd5 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -116,8 +116,9 @@ void kd_enqsc();			/* enqueues a scancode */
 
 void timeout();
 
+#if 0
 #define BROKEN_KEYBOARD_RESET
-
+#endif
 
 struct tty       kd_tty;
 extern int	rebootflag;
@@ -2327,7 +2328,6 @@ kdreboot()
 	kd_sendcmd(0xFE);		/* XXX - magic # */
 	delay(1000000);			/* wait to see if anything happens */
 #endif
-
 	/* 
 	 * If that didn't work, then we'll just have to try and
 	 * do it the hard way.