[src/trunk]: src/sys/dev/sbus Back out rev. 1.26; I forgot about the Javastat...

[pk <pk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48469e2ce5c0
branches:  trunk
changeset: 543559:48469e2ce5c0
user:      pk <pk%NetBSD.org@localhost>
date:      Thu Feb 27 13:33:23 2003 +0000

description:
Back out rev. 1.26; I forgot about the Javastations..

diffstat:

 sys/dev/sbus/cs4231_sbus.c |  17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diffs (45 lines):

diff -r 2808a03f6369 -r 48469e2ce5c0 sys/dev/sbus/cs4231_sbus.c
--- a/sys/dev/sbus/cs4231_sbus.c        Thu Feb 27 13:30:39 2003 +0000
+++ b/sys/dev/sbus/cs4231_sbus.c        Thu Feb 27 13:33:23 2003 +0000
@@ -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 @@
 
 #include <machine/bus.h>
 #include <machine/intr.h>
-#include <machine/autoconf.h>
 
 #include <dev/sbus/sbusvar.h>
 
@@ -149,17 +148,7 @@
 {
        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);
 }