diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 54148b230a..85a0b6400f 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -2,7 +2,7 @@
  * arch/arm/src/stm32/stm32_usbdev.c
  *
  *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.orgr>
  *
  * References:
  *   - RM0008 Reference manual, STMicro document ID 13902
@@ -148,7 +148,7 @@
 
 #define REQRECIPIENT_MASK     (USB_REQ_TYPE_MASK | USB_REQ_RECIPIENT_MASK)
 
-/* Endpoint rister masks (handling toggle fields) */
+/* Endpoint register masks (handling toggle fields) */
 
 #define EPR_NOTOG_MASK        (USB_EPR_CTR_RX  | USB_EPR_SETUP  | USB_EPR_EPTYPE_MASK |\
                                USB_EPR_EP_KIND | USB_EPR_CTR_TX | USB_EPR_EA_MASK)
diff --git a/arch/mips/src/pic32mx/Make.defs b/arch/mips/src/pic32mx/Make.defs
index a021dcb830..3aee3179f5 100644
--- a/arch/mips/src/pic32mx/Make.defs
+++ b/arch/mips/src/pic32mx/Make.defs
@@ -67,5 +67,9 @@ CHIP_CSRCS = pic32mx-irq.c pic32mx-decodeirq.c pic32mx-exception.c pic32mx-gpio.
 # Configuration-dependent PIC32MX files
 
 ifeq ($(CONFIG_GPIO_IRQ),y)
-CHIP_CSRCS += up_gpioirq.c
+CHIP_CSRCS += pic32mx_gpioirq.c
+endif
+
+ifeq ($(CONFIG_PIC32MX_USBDEV),y)
+CHIP_CSRCS += pic32mx-usbdev.c
 endif