[src/trunk]: src/sys/dev/usb Fix/tweak the multiple inclusion protection defi...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/965e6c0c31e2
branches:  trunk
changeset: 340437:965e6c0c31e2
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Sep 05 06:13:54 2015 +0000

description:
Fix/tweak the multiple inclusion protection define names.

diffstat:

 sys/dev/usb/ehcireg.h |  8 ++++----
 sys/dev/usb/ohcireg.h |  8 ++++----
 sys/dev/usb/uhcireg.h |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (78 lines):

diff -r 6b569845862d -r 965e6c0c31e2 sys/dev/usb/ehcireg.h
--- a/sys/dev/usb/ehcireg.h     Sat Sep 05 04:56:53 2015 +0000
+++ b/sys/dev/usb/ehcireg.h     Sat Sep 05 06:13:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehcireg.h,v 1.34 2012/11/04 12:01:55 matt Exp $        */
+/*     $NetBSD: ehcireg.h,v 1.35 2015/09/05 06:13:54 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 ***/
 
@@ -370,4 +370,4 @@
 #define  EHCI_DAR_ENDPOINT     __BITS(3,0)
 #define  EHCI_DAR_ADDRESS      __BITS(14,8)
 
-#endif /* _DEV_PCI_EHCIREG_H_ */
+#endif /* _DEV_USB_EHCIREG_H_ */
diff -r 6b569845862d -r 965e6c0c31e2 sys/dev/usb/ohcireg.h
--- a/sys/dev/usb/ohcireg.h     Sat Sep 05 04:56:53 2015 +0000
+++ b/sys/dev/usb/ohcireg.h     Sat Sep 05 06:13:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohcireg.h,v 1.25 2015/03/30 11:55:00 skrll Exp $       */
+/*     $NetBSD: ohcireg.h,v 1.26 2015/09/05 06:13:54 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 @@
 #define OHCI_ENABLE_POWER_DELAY        5
 #define OHCI_READ_DESC_DELAY   5
 
-#endif /* _DEV_PCI_OHCIREG_H_ */
+#endif /* _DEV_USB_OHCIREG_H_ */
diff -r 6b569845862d -r 965e6c0c31e2 sys/dev/usb/uhcireg.h
--- a/sys/dev/usb/uhcireg.h     Sat Sep 05 04:56:53 2015 +0000
+++ b/sys/dev/usb/uhcireg.h     Sat Sep 05 06:13:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhcireg.h,v 1.19 2008/04/28 20:23:59 martin Exp $      */
+/*     $NetBSD: uhcireg.h,v 1.20 2015/09/05 06:13:54 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 @@
        volatile uhci_physaddr_t qh_elink;
 } uhci_qh_t;
 
-#endif /* _DEV_PCI_UHCIREG_H_ */
+#endif /* _DEV_USB_UHCIREG_H_ */