[src/netbsd-1-5]: src/sys/dev/isa Pull up revision 1.53 (requested by nathanw):

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

details:   https://anonhg.NetBSD.org/src/rev/69d60f0d9c63
branches:  netbsd-1-5
changeset: 490536:69d60f0d9c63
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 20:55:29 2001 +0000

description:
Pull up revision 1.53 (requested by nathanw):
  Support certain ISAPnP ESS 1868 and 1869 cards. Per PR port-i386/11630.

diffstat:

 sys/dev/isa/ess.c |  7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diffs (28 lines):

diff -r ad44ce6d0096 -r 69d60f0d9c63 sys/dev/isa/ess.c
--- a/sys/dev/isa/ess.c Thu Jan 25 20:48:06 2001 +0000
+++ b/sys/dev/isa/ess.c Thu Jan 25 20:55:29 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ess.c,v 1.51.4.1 2000/06/30 16:27:48 simonb Exp $      */
+/*     $NetBSD: ess.c,v 1.51.4.2 2001/01/25 20:55:29 jhawk Exp $       */
 
 /*
  * Copyright 1997
@@ -156,7 +156,6 @@
 void   ess_speaker_on __P((struct ess_softc *));
 void   ess_speaker_off __P((struct ess_softc *));
 
-int    ess_config_addr __P((struct ess_softc *));
 void   ess_config_irq __P((struct ess_softc *));
 void   ess_config_drq __P((struct ess_softc *));
 void   ess_setup __P((struct ess_softc *));
@@ -807,10 +806,6 @@
                return (0);
        }
 
-       /* Configure the ESS chip for the desired audio base address. */
-       if (ess_config_addr(sc))
-               return (0);
-
        if (ess_setup_sc(sc, 1)) 
                return (0);