diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-11-23 18:19:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-11-23 18:19:03 +0000 |
| commit | 04d230d9347dcdeea335ce18417d8461a4818603 (patch) | |
| tree | 63b08a8ea17f1db47c1b3adc6bbaeeb5de5ec896 /sys/arch | |
| parent | b90b98975ed5cc9f15b3cf2fd6a394f73d5defb7 (diff) | |
no more need to cope with pccom
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 7c6dc52024c..c06255e0fa9 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.128 2008/11/22 21:26:48 oga Exp $ */ +/* $OpenBSD: conf.c,v 1.129 2008/11/23 18:19:02 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -179,11 +179,6 @@ cdev_decl(agp); #include "drm.h" cdev_decl(drm); -/* XXX -- this needs to be supported by config(8)! */ -#if (NCOM > 0) && (NPCCOM > 0) -#error com and pccom are mutually exclusive. Sorry. -#endif - #include "wsdisplay.h" #include "wskbd.h" #include "wsmouse.h" @@ -209,11 +204,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NPTY,pts), /* 5: pseudo-tty slave */ cdev_ptc_init(NPTY,ptc), /* 6: pseudo-tty master */ cdev_log_init(1,log), /* 7: /dev/klog */ -#if NPCCOM > 0 - cdev_tty_init(NPCCOM,com), /* 8: serial port */ -#else cdev_tty_init(NCOM,com), /* 8: serial port */ -#endif cdev_disk_init(NFD,fd), /* 9: floppy disk */ cdev_notdef(), /* 10 */ cdev_notdef(), /* 11 */ @@ -462,7 +453,7 @@ struct consdev constab[] = { #if NWSDISPLAY > 0 cons_init(ws), #endif -#if NCOM + NPCCOM > 0 +#if NCOM cons_init(com), #endif { 0 }, |