summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>2000-11-14 01:11:13 +0000
committerjkh <jkh@FreeBSD.org>2000-11-14 01:11:13 +0000
commit4d70e3b5bf21cdfdf12641032ddd97194d5de877 (patch)
tree49cd457ce8458538cfee5d0884df20f0767e86e1
parent387a80f11b3b50fc91ee8eb8b511f044effbc29c (diff)
downloadFreeBSD-src-4d70e3b5bf21cdfdf12641032ddd97194d5de877.zip
FreeBSD-src-4d70e3b5bf21cdfdf12641032ddd97194d5de877.tar.gz
In the year 2000, I think it's perfectly reasonable to include audio
support by default in GENERIC.
-rw-r--r--sys/amd64/conf/GENERIC3
-rw-r--r--sys/amd64/conf/GENERIC.hints4
-rw-r--r--sys/i386/conf/GENERIC3
-rw-r--r--sys/i386/conf/GENERIC.hints4
4 files changed, 14 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 12dcc1f..c932338 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -143,6 +143,9 @@ device npx
# Power management support (see NOTES for more options)
device apm
+# Audio support
+device pcm
+
# PCCARD (PCMCIA) support
device card # pccard bus
device pcic # pcmcia bridge
diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints
index 652faa9..c259d72 100644
--- a/sys/amd64/conf/GENERIC.hints
+++ b/sys/amd64/conf/GENERIC.hints
@@ -43,6 +43,10 @@ hint.pcic.1.irq="11"
hint.pcic.1.port="0x3e2"
hint.pcic.1.maddr="0xd4000"
hint.pcic.1.disabled="1"
+hint.pcm.0.at="isa"
+hint.pcm.0.irq="10"
+hint.pcm.0.drq="1"
+hint.pcm.0.flags="0x0"
hint.sio.0.at="isa"
hint.sio.0.port="0x3F8"
hint.sio.0.flags="0x10"
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 12dcc1f..c932338 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -143,6 +143,9 @@ device npx
# Power management support (see NOTES for more options)
device apm
+# Audio support
+device pcm
+
# PCCARD (PCMCIA) support
device card # pccard bus
device pcic # pcmcia bridge
diff --git a/sys/i386/conf/GENERIC.hints b/sys/i386/conf/GENERIC.hints
index 652faa9..c259d72 100644
--- a/sys/i386/conf/GENERIC.hints
+++ b/sys/i386/conf/GENERIC.hints
@@ -43,6 +43,10 @@ hint.pcic.1.irq="11"
hint.pcic.1.port="0x3e2"
hint.pcic.1.maddr="0xd4000"
hint.pcic.1.disabled="1"
+hint.pcm.0.at="isa"
+hint.pcm.0.irq="10"
+hint.pcm.0.drq="1"
+hint.pcm.0.flags="0x0"
hint.sio.0.at="isa"
hint.sio.0.port="0x3F8"
hint.sio.0.flags="0x10"
OpenPOWER on IntegriCloud