summaryrefslogtreecommitdiff
path: root/nuttx/ChangeLog
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-13 11:27:03 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-13 11:27:03 -0600
commit307cc945b57ad34b631c6e8becc81d63729ecba0 (patch)
tree0363cb2acf245e8b627e01b9b895fbec70c68b84 /nuttx/ChangeLog
parentc84875b8610b207c1f3b733c943288c7ec324941 (diff)
downloadnuttx-307cc945b57ad34b631c6e8becc81d63729ecba0.tar.gz
nuttx-307cc945b57ad34b631c6e8becc81d63729ecba0.tar.bz2
nuttx-307cc945b57ad34b631c6e8becc81d63729ecba0.zip
CDC/ACM: Backward condtional compilation fixed. Provided by Lorenz Meier
Diffstat (limited to 'nuttx/ChangeLog')
-rw-r--r--nuttx/ChangeLog10
1 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index fd906065d..e992e4f78 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5542,8 +5542,10 @@
* arch/arm/src/sama5/chip/sam_emac.h and sam_gmac.h: Register
definition files for the SAMA5 EMAC and GMAC peripherals
(incomplete on the initial commit) (2013-9-12).
- * arch/arm/src/stm32/stm32_can.c: Patch provided by Lorenz
- Meier (2013-9-13).
-
-
+ * arch/arm/src/stm32/stm32_can.c: Make filter register accessible
+ for CAN1 and CAN2. Patch provided by Lorenz Meier (2013-9-13).
+ * nuttx/include/nuttx/usb/cdcacm.h: Fix backward conditional
+ compilation in the CDC/ACM driver with regard to remote
+ wakeup and self-powered capabilites. Provided by Lorenz Meier
+ (2013-9-13)