From dc8c4d581cede4f348c2cfea377379116dd0845e Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 20 Sep 2013 10:00:30 -0600
Subject: [PATCH] Names of some USB device definitions changed to avoid
 collisions

---
 configs/sama5d3x-ek/README.txt     | 2 +-
 configs/sama5d3x-ek/demo/defconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index f3c3b83b7ec..dc820427557 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -1250,7 +1250,7 @@ Configurations
         buffered USB debug data once every second:
 
         Application Configuration -> NSH LIbrary:
-          CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
+          CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH (USB device only)
           CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
         Application Configuration -> System NSH Add-Ons:
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 7a49c0a7838..c991918c4ed 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -154,7 +154,6 @@ CONFIG_SAMA5_DMAC1=y
 CONFIG_SAMA5_UHPHS=y
 CONFIG_SAMA5_UDPHS=y
 # CONFIG_SAMA5_GMAC is not set
-# CONFIG_SAMA5_EMAC is not set
 # CONFIG_SAMA5_LCDC is not set
 # CONFIG_SAMA5_ISI is not set
 # CONFIG_SAMA5_SSC0 is not set
@@ -174,6 +173,8 @@ CONFIG_SAMA5_PIO_IRQ=y
 # CONFIG_SAMA5_PIOC_IRQ is not set
 CONFIG_SAMA5_PIOD_IRQ=y
 # CONFIG_SAMA5_PIOE_IRQ is not set
+CONFIG_SAMA5_HAVE_GMAC=y
+# CONFIG_SAMA5_HAVE_EMAC is not set
 
 #
 # SPI device driver options
@@ -642,7 +643,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_EXAMPLES_CC3000BASIC is not set
 # CONFIG_EXAMPLES_COMPOSITE is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set