summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-23 18:10:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-23 18:10:02 -0600
commit838406f9a042bc6ef21bed330c03b1a2cee700a0 (patch)
tree74517a8e075f80b0de4d45c80cab877f180598bc
parent7e12770b3e30996db6660b99fd3df393aa1918de (diff)
downloadnuttx-838406f9a042bc6ef21bed330c03b1a2cee700a0.tar.gz
nuttx-838406f9a042bc6ef21bed330c03b1a2cee700a0.tar.bz2
nuttx-838406f9a042bc6ef21bed330c03b1a2cee700a0.zip
USB monitor: Fix some bad conditional compilation
-rw-r--r--apps/ChangeLog.txt2
-rw-r--r--apps/system/usbmonitor/usbmonitor.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 268278816..9c5a93280 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -659,4 +659,6 @@
* apps/examples/cc3000: Condition the CC3000 example on having
selected the CC3000 device. Otherwise, you are prompted for
this the CC3000 option on each 'make oldconfig' (2013-9-18).
+ * apps/system/usbmonitor/usbmonitor.c: Fix some bad conditional
+ compilation probably introduced on 2013-9-9 (2013-9-23).
diff --git a/apps/system/usbmonitor/usbmonitor.c b/apps/system/usbmonitor/usbmonitor.c
index 447bff57b..f223be540 100644
--- a/apps/system/usbmonitor/usbmonitor.c
+++ b/apps/system/usbmonitor/usbmonitor.c
@@ -74,7 +74,7 @@
/* USB device trace selection */
-#ifdef USBDEV_TRACE
+#ifdef CONFIG_USBDEV_TRACE
# ifdef CONFIG_SYSTEM_USBMONITOR_TRACEINIT
# define TRACE_INIT_BITS (TRACE_INIT_BIT)
# else