aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound/isa
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2005-09-11 10:07:12 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2005-09-11 10:07:12 +0000
commit6643b656bb7b5b546fa0545a96de8c2e87bbd78d (patch)
treec65a9ae5be5d971d28e83b800b3245e1fe0a238a /sys/dev/sound/isa
parentcaad7408086cb419bb4449b0f603df43fa394a61 (diff)
downloadsrc-6643b656bb7b5b546fa0545a96de8c2e87bbd78d.tar.gz
src-6643b656bb7b5b546fa0545a96de8c2e87bbd78d.zip
Fix misdetection of the sound chip on PC98 systems. The submitter doesn't
believe that there are PC98 systems with an OPTi chip. I don't know enough about this special PC architecture to be sure about this, so let's find out by letting people with such a system complain in case this commit breaks the sound system for them. It's easy to revert then. PR: 45673 Submitted by: Watanabe Kazuhiro <CQG00620@nifty.ne.jp>
Notes
Notes: svn path=/head/; revision=149981
Diffstat (limited to 'sys/dev/sound/isa')
-rw-r--r--sys/dev/sound/isa/mss.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 53bf70ec48b4..298fe604a983 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1367,6 +1367,7 @@ mss_detect(device_t dev, struct mss_info *mss)
name = "AD1848";
mss->bd_id = MD_AD1848; /* AD1848 or CS4248 */
+#ifndef PC98
if (opti_detect(dev, mss)) {
switch (mss->bd_id) {
case MD_OPTI924:
@@ -1379,6 +1380,7 @@ mss_detect(device_t dev, struct mss_info *mss)
printf("Found OPTi device %s\n", name);
if (opti_init(dev, mss) == 0) goto gotit;
}
+#endif
/*
* Check that the I/O address is in use.