CVS commit: src/sys/dev/ic

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Jul 27 08:07:36 UTC 2010

Modified Files:
        src/sys/dev/ic: daic.c

Log Message:
Make it compile again


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/daic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/daic.c
diff -u src/sys/dev/ic/daic.c:1.29 src/sys/dev/ic/daic.c:1.30
--- src/sys/dev/ic/daic.c:1.29	Tue May 12 14:25:17 2009
+++ src/sys/dev/ic/daic.c	Tue Jul 27 08:07:36 2010
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.29 2009/05/12 14:25:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.30 2010/07/27 08:07:36 martin Exp $");
 
 /*
  * daic.c: MI driver for Diehl active ISDN cards (S, SX, SXn, SCOM, QUADRO)
@@ -325,7 +325,7 @@
 	TAILQ_FOREACH(assoc, &sc->sc_outcalls[port], queue) {
 		if (indid == assoc->dchan_id) {
 			printf("%s: D-Channel indication 0x%02x for outgoing call with cdid %d\n",
-				sc-device_xname(&>sc_dev), ind, assoc->cdid);
+				device_xname(&sc->sc_dev), ind, assoc->cdid);
 			goto ind_done;
 		}
 	}
@@ -520,8 +520,8 @@
 		return -1;
 	}
 	if (bus_space_read_1(bus, io, DAIC_BOOT_EBIT+off)) {
-		if (!quiet) printf(": on board memory test failed at %p\n",
-			(void*)bus_space_read_2(bus, io, DAIC_BOOT_ELOC+off));
+		if (!quiet) printf(": on board memory test failed at %x\n",
+			bus_space_read_2(bus, io, DAIC_BOOT_ELOC+off));
 		return -1;
 	}