diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-11-27 10:33:32 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-11-27 10:33:32 +0000 |
| commit | c3a0599eb857ca23bc024e22fe6b0d7e05bc97ea (patch) | |
| tree | 34ec0795ea3655fd3629b4f41889096d5b7d9883 /sys | |
| parent | 49bd0b0f7f43c62c4171eb5b58f001322a7c68e8 (diff) | |
remove #if 0'd entries for /dev/pcmcia functions removed in 1998
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index 20aea88e6b5..32e364e1b93 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.82 2024/09/04 07:45:08 jsg Exp $ */ +/* $OpenBSD: conf.c,v 1.83 2024/11/27 10:33:31 jsg Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -120,10 +120,6 @@ cdev_decl(fd); cdev_decl(lpt); #include "ch.h" #include "bpfilter.h" -#if 0 -#include "pcmcia.h" -cdev_decl(pcmcia); -#endif #include "spkr.h" cdev_decl(spkr); #include "cy.h" @@ -203,11 +199,7 @@ struct cdevsw cdevsw[] = cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ cdev_bpf_init(NBPFILTER,bpf), /* 23: Berkeley packet filter */ cdev_notdef(), /* 24 */ -#if 0 - cdev_ocis_init(NPCMCIA,pcmcia), /* 25: PCMCIA Bus */ -#else cdev_notdef(), /* 25 */ -#endif cdev_notdef(), /* 26 */ cdev_spkr_init(NSPKR,spkr), /* 27: PC speaker */ cdev_notdef(), /* 28 was LKM */ diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index f38968a64ac..6d365e0409f 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.178 2024/06/11 09:21:32 jsg Exp $ */ +/* $OpenBSD: conf.c,v 1.179 2024/11/27 10:33:31 jsg Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -109,10 +109,6 @@ cdev_decl(fd); cdev_decl(lpt); #include "ch.h" #include "bpfilter.h" -#if 0 -#include "pcmcia.h" -cdev_decl(pcmcia); -#endif #include "spkr.h" cdev_decl(spkr); #include "cy.h" @@ -191,11 +187,7 @@ struct cdevsw cdevsw[] = cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ cdev_bpf_init(NBPFILTER,bpf), /* 23: Berkeley packet filter */ cdev_notdef(), /* 24 */ -#if 0 - cdev_ocis_init(NPCMCIA,pcmcia), /* 25: PCMCIA Bus */ -#else cdev_notdef(), /* 25 */ -#endif cdev_joy_init(NJOY,joy), /* 26: joystick */ cdev_spkr_init(NSPKR,spkr), /* 27: PC speaker */ cdev_notdef(), /* 28: was LKM */ |