4 files changed, 32 insertions, 30 deletions

diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index cce758cef2cad..b959a36fe8e98 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -82,17 +82,17 @@
 #define PCI_OHCI_VENDORID_SIS		0x1039
 
 #define PCI_OHCI_DEVICEID_ALADDIN_V	0x523710b9
-static const char *ohci_device_aladdin_v = "AcerLabs M5237 (Aladdin-V) USB Host Controller";
+static const char *ohci_device_aladdin_v = "AcerLabs M5237 (Aladdin-V) USB controller";
 #define PCI_OHCI_DEVICEID_FIRELINK	0xc8611045
-static const char *ohci_device_firelink  = "OPTi 82C861 (FireLink) USB Host Controller";
+static const char *ohci_device_firelink  = "OPTi 82C861 (FireLink) USB controller";
 #define PCI_OHCI_DEVICEID_NEC		0x00351033
-static const char *ohci_device_nec	 = "NEC uPD 9210 USB Host Controller";
+static const char *ohci_device_nec	 = "NEC uPD 9210 USB controller";
 #define PCI_OHCI_DEVICEID_USB0670	0x06701095
-static const char *ohci_device_usb0670	 = "CMD Tech 670 (USB0670) USB Host Controller";
+static const char *ohci_device_usb0670	 = "CMD Tech 670 (USB0670) USB controller";
 #define PCI_OHCI_DEVICEID_USB0673	0x06731095
-static const char *ohci_device_usb0673	 = "CMD Tech 673 (USB0673) USB Host Controller";
+static const char *ohci_device_usb0673	 = "CMD Tech 673 (USB0673) USB controller";
 
-static const char *ohci_device_generic   = "OHCI (generic) USB Host Controller";
+static const char *ohci_device_generic   = "OHCI (generic) USB controller";
 
 #define PCI_OHCI_BASE_REG	0x10
 
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 775ca44c82624..3e84baed52192 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -1,4 +1,4 @@
-/*	FreeBSD $Id: uhci_pci.c,v 1.7 1999/05/01 23:30:06 n_hibma Exp $ */
+/*	FreeBSD $Id: uhci_pci.c,v 1.8 1999/05/08 21:59:42 dfr Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,14 +78,15 @@
 #define PCI_UHCI_VENDORID_INTEL		0x8086
 #define PCI_UHCI_VENDORID_VIA		0x1106
 
-#define PCI_UHCI_DEVICEID_PIIX3         0x70208086ul
-static const char *uhci_device_piix3	= "Intel 82371SB (PIIX3) USB Host Controller";
-#define PCI_UHCI_DEVICEID_PIIX4         0x71128086ul
-#define PCI_UHCI_DEVICEID_PIIX4E        0x71128086ul    /* no separate step */
-static const char *uhci_device_piix4	= "Intel 82371AB/EB (PIIX4) USB Host Controller";
-#define PCI_UHCI_DEVICEID_VT83C572	0x30381106ul
-static const char *uhci_device_vt83c572	= "VIA 83C572 USB Host Controller";
-static const char *uhci_device_generic	= "UHCI (generic) USB Controller";
+#define PCI_UHCI_DEVICEID_PIIX3         0x70208086
+static const char *uhci_device_piix3	= "Intel 82371SB (PIIX3) USB controller";
+#define PCI_UHCI_DEVICEID_PIIX4         0x71128086
+#define PCI_UHCI_DEVICEID_PIIX4E        0x71128086    /* no separate stepping */
+static const char *uhci_device_piix4	= "Intel 82371AB/EB (PIIX4) USB controller";
+#define PCI_UHCI_DEVICEID_VT83C572	0x30381106
+static const char *uhci_device_vt83c572	= "VIA 83C572 USB controller";
+
+static const char *uhci_device_generic	= "UHCI (generic) USB controller";
 
 #define PCI_UHCI_BASE_REG               0x20
 
diff --git a/sys/pci/ohci_pci.c b/sys/pci/ohci_pci.c
index cce758cef2cad..b959a36fe8e98 100644
--- a/sys/pci/ohci_pci.c
+++ b/sys/pci/ohci_pci.c
@@ -82,17 +82,17 @@
 #define PCI_OHCI_VENDORID_SIS		0x1039
 
 #define PCI_OHCI_DEVICEID_ALADDIN_V	0x523710b9
-static const char *ohci_device_aladdin_v = "AcerLabs M5237 (Aladdin-V) USB Host Controller";
+static const char *ohci_device_aladdin_v = "AcerLabs M5237 (Aladdin-V) USB controller";
 #define PCI_OHCI_DEVICEID_FIRELINK	0xc8611045
-static const char *ohci_device_firelink  = "OPTi 82C861 (FireLink) USB Host Controller";
+static const char *ohci_device_firelink  = "OPTi 82C861 (FireLink) USB controller";
 #define PCI_OHCI_DEVICEID_NEC		0x00351033
-static const char *ohci_device_nec	 = "NEC uPD 9210 USB Host Controller";
+static const char *ohci_device_nec	 = "NEC uPD 9210 USB controller";
 #define PCI_OHCI_DEVICEID_USB0670	0x06701095
-static const char *ohci_device_usb0670	 = "CMD Tech 670 (USB0670) USB Host Controller";
+static const char *ohci_device_usb0670	 = "CMD Tech 670 (USB0670) USB controller";
 #define PCI_OHCI_DEVICEID_USB0673	0x06731095
-static const char *ohci_device_usb0673	 = "CMD Tech 673 (USB0673) USB Host Controller";
+static const char *ohci_device_usb0673	 = "CMD Tech 673 (USB0673) USB controller";
 
-static const char *ohci_device_generic   = "OHCI (generic) USB Host Controller";
+static const char *ohci_device_generic   = "OHCI (generic) USB controller";
 
 #define PCI_OHCI_BASE_REG	0x10
 
diff --git a/sys/pci/uhci_pci.c b/sys/pci/uhci_pci.c
index 775ca44c82624..3e84baed52192 100644
--- a/sys/pci/uhci_pci.c
+++ b/sys/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/*	FreeBSD $Id: uhci_pci.c,v 1.7 1999/05/01 23:30:06 n_hibma Exp $ */
+/*	FreeBSD $Id: uhci_pci.c,v 1.8 1999/05/08 21:59:42 dfr Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,14 +78,15 @@
 #define PCI_UHCI_VENDORID_INTEL		0x8086
 #define PCI_UHCI_VENDORID_VIA		0x1106
 
-#define PCI_UHCI_DEVICEID_PIIX3         0x70208086ul
-static const char *uhci_device_piix3	= "Intel 82371SB (PIIX3) USB Host Controller";
-#define PCI_UHCI_DEVICEID_PIIX4         0x71128086ul
-#define PCI_UHCI_DEVICEID_PIIX4E        0x71128086ul    /* no separate step */
-static const char *uhci_device_piix4	= "Intel 82371AB/EB (PIIX4) USB Host Controller";
-#define PCI_UHCI_DEVICEID_VT83C572	0x30381106ul
-static const char *uhci_device_vt83c572	= "VIA 83C572 USB Host Controller";
-static const char *uhci_device_generic	= "UHCI (generic) USB Controller";
+#define PCI_UHCI_DEVICEID_PIIX3         0x70208086
+static const char *uhci_device_piix3	= "Intel 82371SB (PIIX3) USB controller";
+#define PCI_UHCI_DEVICEID_PIIX4         0x71128086
+#define PCI_UHCI_DEVICEID_PIIX4E        0x71128086    /* no separate stepping */
+static const char *uhci_device_piix4	= "Intel 82371AB/EB (PIIX4) USB controller";
+#define PCI_UHCI_DEVICEID_VT83C572	0x30381106
+static const char *uhci_device_vt83c572	= "VIA 83C572 USB controller";
+
+static const char *uhci_device_generic	= "UHCI (generic) USB controller";
 
 #define PCI_UHCI_BASE_REG               0x20