diff --git a/sys/conf/majors b/sys/conf/majors index 6e1b3f17117c..f58806a60529 100644 --- a/sys/conf/majors +++ b/sys/conf/majors @@ -22,7 +22,6 @@ 4 *geom GEOMetry 19 *tw X-10 power interface 22 *fd (/dev/stdin etc) -30 *snd sound driver system 32 lkmc Loadable Kernel Module Controller 33 lkm assigned to Loadable Kernel Modules 34 lkm assigned to Loadable Kernel Modules @@ -54,7 +53,6 @@ 93 coda CODA filesystem. 96 altq alternate queueing (including cbq, red, wfq) 98 loe Loopback pseudo-ethernet (sbabkin@dcn.att.com) -99 *ct Cronyx Tau-ISA serial adapters (driver name "ctau") 115 dag University of Waikato DAG network capture boards 117 *acd ATAPI CDROM 119 *ast ATAPI tape diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 1adc6ceed341..5d3aa5256e74 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -52,7 +52,6 @@ struct cdevsw dsp_cdevsw = { .d_poll = dsp_poll, .d_mmap = dsp_mmap, .d_name = "dsp", - .d_maj = SND_CDEV_MAJOR, }; #ifdef USING_DEVFS diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index fed0fc5a3be5..58468477af41 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -79,7 +79,6 @@ static struct cdevsw mixer_cdevsw = { .d_close = mixer_close, .d_ioctl = mixer_ioctl, .d_name = "mixer", - .d_maj = SND_CDEV_MAJOR, }; #ifdef USING_DEVFS diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 7113bf1e6d24..40d3f7e25d90 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -50,7 +50,6 @@ static struct cdevsw sndstat_cdevsw = { .d_close = sndstat_close, .d_read = sndstat_read, .d_name = "sndstat", - .d_maj = SND_CDEV_MAJOR, }; struct sndstat_entry { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index e4cac240247d..56b76f0f6b89 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -152,11 +152,6 @@ nomenclature: struct pcm_channel *fkchan_setup(device_t dev); int fkchan_kill(struct pcm_channel *c); -/* - * Major nuber for the sound driver. - */ -#define SND_CDEV_MAJOR 30 - #define SND_MAXVCHANS 255 /* diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c index 968ee56cea9e..033882d9713e 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -82,7 +82,6 @@ static struct cdevsw isavga_cdevsw = { .d_ioctl = isavga_ioctl, .d_mmap = isavga_mmap, .d_name = VGA_DRIVER_NAME, - .d_maj = -1, }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index 8d463fb2604d..9df28d565596 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -113,7 +113,6 @@ static struct cdevsw gdc_cdevsw = { .d_ioctl = gdcioctl, .d_mmap = gdcmmap, .d_name = DRIVER_NAME, - .d_maj = -1, }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c index 8d463fb2604d..9df28d565596 100644 --- a/sys/pc98/pc98/pc98gdc.c +++ b/sys/pc98/pc98/pc98gdc.c @@ -113,7 +113,6 @@ static struct cdevsw gdc_cdevsw = { .d_ioctl = gdcioctl, .d_mmap = gdcmmap, .d_name = DRIVER_NAME, - .d_maj = -1, }; #endif /* FB_INSTALL_CDEV */