diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-09-02 19:17:34 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-09-02 19:17:34 +0000 |
| commit | db901281608f0c69c05dd9ab366155d3225f0fd2 (patch) | |
| tree | 7a2608d6dcb635a62d8e1c2979ae0dee7f977a8e /sys/dev/ccd | |
| parent | f3dcf66158f676bb2cac90e97fbf004a59ff8383 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ccd')
| -rw-r--r-- | sys/dev/ccd/ccd.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 0dd13fb6424b..7b06a8914856 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -87,7 +87,6 @@ * Moffett Field, CA 94035 */ -#include "opt_devfs.h" #include "ccd.h" #include <sys/param.h> @@ -109,11 +108,6 @@ #include <sys/ccdvar.h> -#ifdef DEVFS -#include <sys/eventhandler.h> -#include <fs/devfs/devfs.h> -#endif - #if defined(CCDDEBUG) && !defined(DEBUG) #define DEBUG #endif @@ -289,7 +283,6 @@ putccdbuf(struct ccdbuf *cbp) #define CCD_OFFSET 16 #endif -#ifdef DEVFS static void ccd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -298,7 +291,7 @@ ccd_clone(void *arg, char *name, int namelen, dev_t *dev) if (*dev != NODEV) return; - i = devfs_stdclone(name, &s, "ccd", &u); + i = dev_stdclone(name, &s, "ccd", &u); if (i != 2) return; if (u >= numccd) @@ -310,7 +303,6 @@ ccd_clone(void *arg, char *name, int namelen, dev_t *dev) *dev = make_dev(&ccd_cdevsw, u * 8 + *s - 'a', UID_ROOT, GID_OPERATOR, 0640, name); } -#endif DEVFS /* * Called by main() during pseudo-device attachment. All we need @@ -348,9 +340,7 @@ ccdattach() /* XXX: is this necessary? */ for (i = 0; i < numccd; ++i) ccddevs[i].ccd_dk = -1; -#ifdef DEVFS - EVENTHANDLER_REGISTER(devfs_clone, ccd_clone, 0, 1000); -#endif + EVENTHANDLER_REGISTER(dev_clone, ccd_clone, 0, 1000); } static int |