Module Name: src
Committed By: skrll
Date: Sat Apr 4 06:22:06 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehcireg.h ohcireg.h uhcireg.h
Log Message:
Correct directory reference in multiple inclusion protection variable
name
To generate a diff of this commit:
cvs rdiff -u -r1.34.14.8 -r1.34.14.9 src/sys/dev/usb/ehcireg.h
cvs rdiff -u -r1.24.6.3 -r1.24.6.4 src/sys/dev/usb/ohcireg.h
cvs rdiff -u -r1.19.66.1 -r1.19.66.2 src/sys/dev/usb/uhcireg.h
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/usb/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.34.14.8 src/sys/dev/usb/ehcireg.h:1.34.14.9
--- src/sys/dev/usb/ehcireg.h:1.34.14.8 Mon Mar 30 11:57:12 2015
+++ src/sys/dev/usb/ehcireg.h Sat Apr 4 06:22:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcireg.h,v 1.34.14.8 2015/03/30 11:57:12 skrll Exp $ */
+/* $NetBSD: ehcireg.h,v 1.34.14.9 2015/04/04 06:22:06 skrll Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -36,8 +36,8 @@
* http://www.usb.org/developers/data/usb_20.zip
*/
-#ifndef _DEV_PCI_EHCIREG_H_
-#define _DEV_PCI_EHCIREG_H_
+#ifndef _DEV_USB_EHCIREG_H_
+#define _DEV_USB_EHCIREG_H_
/*** PCI config registers ***/
@@ -433,4 +433,4 @@ typedef struct {
#define EHCI_DAR_ENDPOINT __BITS(3,0)
#define EHCI_DAR_ADDRESS __BITS(14,8)
-#endif /* _DEV_PCI_EHCIREG_H_ */
+#endif /* _DEV_USB_EHCIREG_H_ */
Index: src/sys/dev/usb/ohcireg.h
diff -u src/sys/dev/usb/ohcireg.h:1.24.6.3 src/sys/dev/usb/ohcireg.h:1.24.6.4
--- src/sys/dev/usb/ohcireg.h:1.24.6.3 Mon Mar 30 11:56:42 2015
+++ src/sys/dev/usb/ohcireg.h Sat Apr 4 06:22:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcireg.h,v 1.24.6.3 2015/03/30 11:56:42 skrll Exp $ */
+/* $NetBSD: ohcireg.h,v 1.24.6.4 2015/04/04 06:22:06 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -31,8 +31,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _DEV_PCI_OHCIREG_H_
-#define _DEV_PCI_OHCIREG_H_
+#ifndef _DEV_USB_OHCIREG_H_
+#define _DEV_USB_OHCIREG_H_
/*** PCI config registers ***/
@@ -239,4 +239,4 @@ typedef struct {
#define OHCI_ENABLE_POWER_DELAY 5
#define OHCI_READ_DESC_DELAY 5
-#endif /* _DEV_PCI_OHCIREG_H_ */
+#endif /* _DEV_USB_OHCIREG_H_ */
Index: src/sys/dev/usb/uhcireg.h
diff -u src/sys/dev/usb/uhcireg.h:1.19.66.1 src/sys/dev/usb/uhcireg.h:1.19.66.2
--- src/sys/dev/usb/uhcireg.h:1.19.66.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uhcireg.h Sat Apr 4 06:22:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcireg.h,v 1.19.66.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uhcireg.h,v 1.19.66.2 2015/04/04 06:22:06 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.12 1999/11/17 22:33:42 n_hibma Exp $ */
/*
@@ -31,8 +31,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _DEV_PCI_UHCIREG_H_
-#define _DEV_PCI_UHCIREG_H_
+#ifndef _DEV_USB_UHCIREG_H_
+#define _DEV_USB_UHCIREG_H_
/*** PCI config registers ***/
@@ -194,4 +194,4 @@ typedef struct {
volatile uhci_physaddr_t qh_elink;
} uhci_qh_t;
-#endif /* _DEV_PCI_UHCIREG_H_ */
+#endif /* _DEV_USB_UHCIREG_H_ */
