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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/if_msk.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/if_msk.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.43
retrieving revision 1.43.4.1
diff -u -p -r1.43 -r1.43.4.1
--- src/sys/dev/pci/if_msk.c	2013/03/30 03:21:06	1.43
+++ src/sys/dev/pci/if_msk.c	2014/05/18 17:45:40	1.43.4.1
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.43 2013/03/30 03:21:06 christos Exp $ */
+/* $NetBSD: if_msk.c,v 1.43.4.1 2014/05/18 17:45:40 rmind Exp $ */
 /*	$OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $	*/
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.43 2013/03/30 03:21:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.43.4.1 2014/05/18 17:45:40 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1167,6 +1167,7 @@ mskc_attach(device_t parent, device_t se
 	void *kva;
 	bus_dma_segment_t seg;
 	int rseg;
+	char intrbuf[PCI_INTRSTR_LEN];
 
 	DPRINTFN(2, ("begin mskc_attach\n"));
 
@@ -1241,7 +1242,7 @@ mskc_attach(device_t parent, device_t se
 		goto fail_1;
 	}
 
-	intrstr = pci_intr_string(pc, ih);
+	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
 	sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, msk_intr, sc);
 	if (sc->sk_intrhand == NULL) {
 		aprint_error(": couldn't establish interrupt");
@@ -2412,12 +2413,6 @@ SYSCTL_SETUP(sysctl_msk, "sysctl msk sub
 	int rc;
 	const struct sysctlnode *node;
 
-	if ((rc = sysctl_createv(clog, 0, NULL, NULL,
-	    0, CTLTYPE_NODE, "hw", NULL,
-	    NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) {
-		goto err;
-	}
-
 	if ((rc = sysctl_createv(clog, 0, NULL, &node,
 	    0, CTLTYPE_NODE, "msk",
 	    SYSCTL_DESCR("msk interface controls"),