[Midnightbsd-cvs] src: dev/mse: woo hoo

[laffer1 at midnightbsd.org]

Log Message:
-----------
woo hoo

Modified Files:
--------------
    src/sys/dev/mse:
        mse.c (r1.1.1.1 -> r1.2)
        mse_cbus.c (r1.1.1.1 -> r1.2)
        mse_isa.c (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: mse.c
===================================================================
RCS file: /home/cvs/src/sys/dev/mse/mse.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/mse/mse.c -L sys/dev/mse/mse.c -u -r1.1.1.1 -r1.2
--- sys/dev/mse/mse.c
+++ sys/dev/mse/mse.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/mse/mse.c,v 1.72 2005/04/08 05:22:58 imp Exp $
+ * $FreeBSD: src/sys/dev/mse/mse.c,v 1.75 2007/02/23 12:18:47 piso Exp $
  */
 
 /*
@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
@@ -134,8 +133,8 @@
 		return ENXIO;
 	}
 
-	if (BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_intr,
-	    INTR_TYPE_TTY, mseintr, sc, &sc->sc_ih)) {
+	if (bus_setup_intr(dev, sc->sc_intr,
+	    INTR_TYPE_TTY, NULL, mseintr, sc, &sc->sc_ih)) {
 		bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
 		bus_release_resource(dev, SYS_RES_IRQ, rid, sc->sc_intr);
 		return ENXIO;
Index: mse_cbus.c
===================================================================
RCS file: /home/cvs/src/sys/dev/mse/mse_cbus.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/mse/mse_cbus.c -L sys/dev/mse/mse_cbus.c -u -r1.1.1.1 -r1.2
--- sys/dev/mse/mse_cbus.c
+++ sys/dev/mse/mse_cbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/mse/mse_cbus.c,v 1.4 2005/04/08 05:22:58 imp Exp $
+ * $FreeBSD: src/sys/dev/mse/mse_cbus.c,v 1.5 2006/05/16 14:36:28 phk Exp $
  */
 
 /*-
@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
Index: mse_isa.c
===================================================================
RCS file: /home/cvs/src/sys/dev/mse/mse_isa.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/mse/mse_isa.c -L sys/dev/mse/mse_isa.c -u -r1.1.1.1 -r1.2
--- sys/dev/mse/mse_isa.c
+++ sys/dev/mse/mse_isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/mse/mse_isa.c,v 1.4 2005/04/08 05:22:58 imp Exp $
+ * $FreeBSD: src/sys/dev/mse/mse_isa.c,v 1.5 2006/05/16 14:36:28 phk Exp $
  */
 
 /*-
@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>