diff --git a/arch/avr/src/at90usb/at90usb_usbdev.c b/arch/avr/src/at90usb/at90usb_usbdev.c
index 1c10faba81b..721aaa25461 100644
--- a/arch/avr/src/at90usb/at90usb_usbdev.c
+++ b/arch/avr/src/at90usb/at90usb_usbdev.c
@@ -2303,7 +2303,7 @@ static void avr_epfreereq(FAR struct usbdev_ep_s *ep,
 static void *avr_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes)
 {
   usbtrace(TRACE_EPALLOCBUFFER, privep->ep.eplog);
-return malloc(bytes)}
+  return malloc(bytes)}
 #endif
 
 /*******************************************************************************
@@ -2314,7 +2314,7 @@ return malloc(bytes)}
  *
  *******************************************************************************/
 
-#ifdef CONFIG_AVR_USBDEV_DMA
+#ifdef CONFIG_ARCH_USBDEV_DMA
 static void avr_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
 {
   usbtrace(TRACE_EPFREEBUFFER, privep->ep.eplog);
diff --git a/arch/avr/src/avr/avr_internal.h b/arch/avr/src/avr/avr_internal.h
index 288a8914a8c..13c5d37c5a4 100644
--- a/arch/avr/src/avr/avr_internal.h
+++ b/arch/avr/src/avr/avr_internal.h
@@ -152,12 +152,11 @@ extern uint8_t *up_doirq(uint8_t irq, uint8_t *regs);
  *      avr_spicmddata() function in your board-specific logic.  This functions will
  *      perform cmd/data selection operations using GPIOs in the way your board is
  *      configured.
- *   3. Add a call to up_spiinitialize() in your low level application
+ *   3. Add a call to at90usb_spiinitialize() in your low level application
  *      initialization logic
  *   4. The handle returned by up_spiinitialize() may then be used to bind the
- *      SPI driver to higher level logic (e.g., calling 
- *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
- *      the SPI MMC/SD driver).
+ *      SPI driver to higher level logic (e.g., calling  mmcsd_spislotinitialize(),
+ *      for example, will bind the SPI driver to the SPI MMC/SD driver).
  *
  ************************************************************************************/