From 06da1def0c009fd5d9ae4782bb3f298aa15dc655 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 14 Sep 2001 04:58:30 +0000 Subject: [PATCH] Merge from sys/i386/isa/sprk.c 1.50, 1.51 KSE changes and acpi attachment Reviewed by: julian, bde, jhb --- sys/pc98/pc98/spkr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c index f3436d5b5c95..4fd2667d1c2b 100644 --- a/sys/pc98/pc98/spkr.c +++ b/sys/pc98/pc98/spkr.c @@ -494,11 +494,11 @@ static int spkr_active = FALSE; /* exclusion flag */ static char *spkr_inbuf; /* incoming buf */ int -spkropen(dev, flags, fmt, p) +spkropen(dev, flags, fmt, td) dev_t dev; int flags; int fmt; - struct proc *p; + struct thread *td; { #ifdef DEBUG (void) printf("spkropen: entering with dev = %s\n", devtoname(dev)); @@ -553,11 +553,11 @@ spkrwrite(dev, uio, ioflag) } int -spkrclose(dev, flags, fmt, p) +spkrclose(dev, flags, fmt, td) dev_t dev; int flags; int fmt; - struct proc *p; + struct thread *td; { #ifdef DEBUG (void) printf("spkrclose: entering with dev = %s\n", devtoname(dev)); @@ -576,12 +576,12 @@ spkrclose(dev, flags, fmt, p) } int -spkrioctl(dev, cmd, cmdarg, flags, p) +spkrioctl(dev, cmd, cmdarg, flags, td) dev_t dev; unsigned long cmd; caddr_t cmdarg; int flags; - struct proc *p; + struct thread *td; { #ifdef DEBUG (void) printf("spkrioctl: entering with dev = %s, cmd = %lx\n", @@ -671,5 +671,6 @@ static driver_t atspeaker_driver = { static devclass_t atspeaker_devclass; DRIVER_MODULE(atspeaker, isa, atspeaker_driver, atspeaker_devclass, 0, 0); +DRIVER_MODULE(atspeaker, acpi, atspeaker_driver, atspeaker_devclass, 0, 0); /* spkr.c ends here */