summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpk <pk@NetBSD.org>2003-02-27 13:33:23 +0000
committerpk <pk@NetBSD.org>2003-02-27 13:33:23 +0000
commit7f7fb5aa9c0a819fce579379e8f600edcc87e4e0 (patch)
tree3d4a4f621a88aeea61b22879106b195d32a07d34 /sys/dev
parentdb0731296177118c6987606ffb2283f4ff8dc5dc (diff)
Back out rev. 1.26; I forgot about the Javastations..
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/cs4231_sbus.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/sbus/cs4231_sbus.c b/sys/dev/sbus/cs4231_sbus.c
index 552e8628998..cfc8856e1df 100644
--- a/sys/dev/sbus/cs4231_sbus.c
+++ b/sys/dev/sbus/cs4231_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_sbus.c,v 1.26 2003/02/27 13:30:39 pk Exp $ */
+/* $NetBSD: cs4231_sbus.c,v 1.27 2003/02/27 13:33:23 pk Exp $ */
/*-
* Copyright (c) 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.26 2003/02/27 13:30:39 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.27 2003/02/27 13:33:23 pk Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.26 2003/02/27 13:30:39 pk Exp $");
#include <machine/bus.h>
#include <machine/intr.h>
-#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
@@ -149,17 +148,7 @@ cs4231_sbus_match(parent, cf, aux)
{
struct sbus_attach_args *sa = aux;
- if (strcmp(sa->sa_name, AUDIOCS_PROM_NAME) != 0)
- return (0);
-
- /*
- * Some machine have a SUNW,CS4231 node, but no hardware.
- * It seems these can be identified by a `serial' device type.
- */
- if (strcmp(PROM_getpropstring(sa->sa_node, "device_type"),
- "serial") == 0)
- return (0);
- return (1);
+ return (strcmp(sa->sa_name, AUDIOCS_PROM_NAME) == 0);
}