summaryrefslogtreecommitdiffstats
path: root/sys/dev/speaker
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-11-11 09:57:32 +0000
committerru <ru@FreeBSD.org>2005-11-11 09:57:32 +0000
commit61c0ca0abb146b3965f3b99a542bd310c599ee00 (patch)
tree655b865ee787feb1738baa0b0344fac767b143b6 /sys/dev/speaker
parent1e312e1197fb6399949da259dfd37b5d126257aa (diff)
downloadFreeBSD-src-61c0ca0abb146b3965f3b99a542bd310c599ee00.zip
FreeBSD-src-61c0ca0abb146b3965f3b99a542bd310c599ee00.tar.gz
Add /dev/speaker support to amd64.
The following repo-copies were made (by Mark Murray): sys/i386/isa/spkr.c -> sys/dev/speaker/spkr.c sys/i386/include/speaker.h -> sys/dev/speaker/speaker.h share/man/man4/man4.i386/spkr.4 -> share/man/man4/spkr.4
Diffstat (limited to 'sys/dev/speaker')
-rw-r--r--sys/dev/speaker/speaker.h6
-rw-r--r--sys/dev/speaker/spkr.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index 6b1f021..9e195c3 100644
--- a/sys/dev/speaker/speaker.h
+++ b/sys/dev/speaker/speaker.h
@@ -7,8 +7,8 @@
* $FreeBSD$
*/
-#ifndef _MACHINE_SPEAKER_H_
-#define _MACHINE_SPEAKER_H_
+#ifndef _DEV_SPEAKER_SPEAKER_H_
+#define _DEV_SPEAKER_SPEAKER_H_
#include <sys/ioccom.h>
@@ -26,4 +26,4 @@ typedef struct
* see the spkr(4) man page for details.
*/
-#endif /* !_MACHINE_SPEAKER_H_ */
+#endif /* !_DEV_SPEAKER_SPEAKER_H_ */
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index d265e7c..bad65c1 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -20,9 +20,9 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <isa/isavar.h>
#include <machine/clock.h>
-#include <machine/speaker.h>
#include <machine/ppireg.h>
#include <machine/timerreg.h>
+#include <dev/speaker/speaker.h>
static d_open_t spkropen;
static d_close_t spkrclose;
OpenPOWER on IntegriCloud