diff options
| author | Thomas Bushnell <thomas@gnu.org> | 1997-04-17 20:10:41 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 1997-04-17 20:10:41 +0000 |
| commit | d3a30dc4c105f0ffc185030b0ba3a946369c015b (patch) | |
| tree | 85468c465681694bbf92817e7b414504cb746287 | |
| parent | caf359e521041e7aa6290aa04225e974f73befd2 (diff) | |
Wed Apr 16 12:52:25 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* i386/Drivers.in (com): Delete option. It's required by
kd_mouse.c.
* i386/Makefrag (i386at-files): Add com.c.
(driver-files): Delete variable.
* i386/bogus/com.h: Revert change of March 10.
* i386/device-drivers.h.in (CONFIG_MACH_COM): Delete option.
Bug report from Marcus G. Daniels (marcus@cathcart.sysc.pdx.edu).
| -rw-r--r-- | i386/Drivers.in | 4 | ||||
| -rw-r--r-- | i386/Makefrag | 5 | ||||
| -rw-r--r-- | i386/bogus/com.h | 7 | ||||
| -rw-r--r-- | i386/device-drivers.h.in | 1 |
4 files changed, 2 insertions, 15 deletions
diff --git a/i386/Drivers.in b/i386/Drivers.in index b58eb1a..f45f6b8 100644 --- a/i386/Drivers.in +++ b/i386/Drivers.in @@ -58,10 +58,6 @@ 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 diff --git a/i386/Makefrag b/i386/Makefrag index d08bc3f..18479c6 100644 --- a/i386/Makefrag +++ b/i386/Makefrag @@ -17,7 +17,7 @@ DEFINES += -DCONTINUATIONS -DLINUX_DEV -D__ELF__ -Di386 # Source files for any i386 kernel -i386at-files = autoconf.c blit.c conf.c cons_conf.c fd.c rtc.c \ +i386at-files = autoconf.c blit.c com.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 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 \ @@ -26,9 +26,6 @@ i386-files = ast_check.c db_disasm.c db_interface.c db_trace.c debug_i386.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 diff --git a/i386/bogus/com.h b/i386/bogus/com.h index ec56981..ea7ad7a 100644 --- a/i386/bogus/com.h +++ b/i386/bogus/com.h @@ -1,7 +1,2 @@ -#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 index f09fe08..a3afe6a 100644 --- a/i386/device-drivers.h.in +++ b/i386/device-drivers.h.in @@ -2,7 +2,6 @@ #undef CONFIG_SCSI #undef CONFIG_INET -#undef CONFIG_MACH_COM #undef CONFIG_BLK_DEV_FD #undef CONFIG_BLK_DEV_IDE #undef CONFIG_SCSI_ADVANSYS |