aboutsummaryrefslogtreecommitdiff
path: root/nuttx/include/termios.h
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-01-11 02:14:43 -0800
committerpx4dev <px4@purgatory.org>2013-01-11 02:14:43 -0800
commitf127495caa2d45a1b1fff3be7a9d3756259d23e2 (patch)
tree91daf599eae326f2207d0fbd9ede34b51eca1812 /nuttx/include/termios.h
parent48c5d63319be3b8da7c4cd598d2a31dceae842a7 (diff)
downloadpx4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.gz
px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.bz2
px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.zip
Manually fixup merge botches via direct comparison with NuttX r5447.
Diffstat (limited to 'nuttx/include/termios.h')
-rw-r--r--nuttx/include/termios.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/include/termios.h b/nuttx/include/termios.h
index 537edbd8f..3032e4746 100644
--- a/nuttx/include/termios.h
+++ b/nuttx/include/termios.h
@@ -232,7 +232,7 @@ struct termios
* cf[set|get][o|i]speed() POSIX interfaces.
*/
- speed_t c_speed; /* Input/output speed (non-POSIX)*/
+ speed_t c_speed; /* Input/output speed (non-POSIX)*/
};
/****************************************************************************