From 61c0ca0abb146b3965f3b99a542bd310c599ee00 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Fri, 11 Nov 2005 09:57:32 +0000
Subject: 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
---
 sys/dev/speaker/speaker.h | 6 +++---
 sys/dev/speaker/spkr.c    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sys/dev')

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;
-- 
cgit v1.1