summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-22 07:25:01 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-22 07:25:01 -0600
commitb87ffa0e0a4216395a67d781b4db2a151548d7ed (patch)
tree47faf49bd7bfc4545da0165d5dcf705c1dc19d51
parent5c5ae684246f7278d34e9d21cca82d9f82d4058a (diff)
downloadnuttx-b87ffa0e0a4216395a67d781b4db2a151548d7ed.tar.gz
nuttx-b87ffa0e0a4216395a67d781b4db2a151548d7ed.tar.bz2
nuttx-b87ffa0e0a4216395a67d781b4db2a151548d7ed.zip
Update ChangeLog
-rw-r--r--nuttx/ChangeLog8
-rw-r--r--nuttx/arch/arm/src/stm32/chip/stm32_dac.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 74c88aaef..b78a17bde 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7756,4 +7756,12 @@
backward (2014-7-20).
* drivers/net/slip.c: Fix an error in SLIP escaping. From Max
Neklyudov (2014-7-22).
+ * drivers/input/Kconfg: Add missing configuration option to select the
+ MAX11802 touchscreen controller. From Petteri Aimonen (2014-7-22).
+ * arm/src/stm32/chip/stm32_dac.h: Fix typos, from Peterri Aimonen
+ (2014-7-22).
+ * arch/arm/src/stm32/stm32_otgfsdev.c: STM32 OTGFS device: Various
+ changes to try to reduce that amount of time in interrupts handles and
+ with interrupts disbled. Needs verification on other platforms. From
+ Petteri Aimonen (2014-7-22).
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_dac.h b/nuttx/arch/arm/src/stm32/chip/stm32_dac.h
index 14ea3e341..8669421fa 100644
--- a/nuttx/arch/arm/src/stm32/chip/stm32_dac.h
+++ b/nuttx/arch/arm/src/stm32/chip/stm32_dac.h
@@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/stm32/chip/stm32_dac.h
*
- * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without