summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/ohci_pci.c7
-rw-r--r--sys/dev/usb/ohci.c4
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index b4fbe0867c7..4292d75d0a0 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci_pci.c,v 1.11 2001/06/12 19:11:59 mickey Exp $ */
+/* $OpenBSD: ohci_pci.c,v 1.12 2001/06/13 07:43:35 deraadt Exp $ */
/* $NetBSD: ohci_pci.c,v 1.9 1999/05/20 09:52:35 augustss Exp $ */
/*
@@ -149,11 +149,12 @@ ohci_pci_attach(parent, self, aux)
printf("\n");
return;
}
- printf(": %s\n", intrstr);
+ printf(": %s", intrstr);
r = ohci_init(&sc->sc);
if (r != USBD_NORMAL_COMPLETION) {
- printf(": init failed, error=%d\n", r);
+ printf("%s: init failed, error=%d\n",
+ sc->sc.sc_bus.bdev.dv_xname, r);
return;
}
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 79fcc8c1faa..f367b7a3430 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.21 2001/05/03 02:20:32 aaron Exp $ */
+/* $OpenBSD: ohci.c,v 1.22 2001/06/13 07:43:36 deraadt Exp $ */
/* $NetBSD: ohci.c,v 1.102 2001/04/01 15:00:29 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -653,9 +653,7 @@ ohci_init(ohci_softc_t *sc)
rev = OREAD4(sc, OHCI_REVISION);
printf(" OHCI version %d.%d%s", OHCI_REV_HI(rev), OHCI_REV_LO(rev),
OHCI_REV_LEGACY(rev) ? ", legacy support" : "");
-#if !defined(__OpenBSD__)
printf("\n");
-#endif
if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) {
printf("%s: unsupported OHCI revision\n",