summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-05-06 05:40:44 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-05-06 05:40:44 +0000
commit87ba09105d3e85fc1003a5b53f6c99e4bc126ad3 (patch)
tree417c985cb66739fc79773d840382e3c062d4a766 /sys/dev/usb
parent49f167350bd35464cf9a52e22fd0b607ec1c76b6 (diff)
Make more portable with NetBSD
Whitespace sync with NetBSD
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/uyap.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index cc8cbf37bd5..ade6503df08 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uyap.c,v 1.3 2001/12/17 01:39:08 deraadt Exp $ */
-/* $NetBSD: uyap.c,v 1.4 2001/07/11 04:53:18 augustss Exp $ */
+/* $OpenBSD: uyap.c,v 1.4 2002/05/06 05:40:43 nate Exp $ */
+/* $NetBSD: uyap.c,v 1.5 2001/11/13 06:24:57 lukem Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,11 @@
#include <dev/usb/ezload.h>
const struct ezdata uyap_firmware[] = {
+#if defined(__OpenBSD__)
#include "dev/microcode/uyap/uyap_firmware.h"
+#else
+#include "dev/usb/uyap_firmware.h"
+#endif
};
const struct ezdata *uyap_firmwares[] = { uyap_firmware, NULL };
@@ -70,7 +74,7 @@ USB_MATCH(uyap)
/* Match the boot device. */
if (uaa->vendor == USB_VENDOR_SILICONPORTALS &&
- uaa->product == USB_PRODUCT_SILICONPORTALS_YAPPH_NF)
+ uaa->product == USB_PRODUCT_SILICONPORTALS_YAPPH_NF)
return (UMATCH_VENDOR_PRODUCT);
return (UMATCH_NONE);