diff options
| author | px4dev <px4@purgatory.org> | 2013-02-06 23:50:55 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-02-06 23:50:55 -0800 |
| commit | 8cb583cf8031f4e7db77e1b88ea164e7ff5994c9 (patch) | |
| tree | 3b28e5ca358ca3ce46fc30cbd1bfbb9d166ae1dc /nuttx/include | |
| parent | 0c7c32ce95e2643d44fb41784c354cd6a852335c (diff) | |
| download | px4-firmware-8cb583cf8031f4e7db77e1b88ea164e7ff5994c9.tar.gz px4-firmware-8cb583cf8031f4e7db77e1b88ea164e7ff5994c9.tar.bz2 px4-firmware-8cb583cf8031f4e7db77e1b88ea164e7ff5994c9.zip | |
Assorted compile fixes.
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/serial/serial.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nuttx/include/nuttx/serial/serial.h b/nuttx/include/nuttx/serial/serial.h index d72038e17..4ee2005ef 100644 --- a/nuttx/include/nuttx/serial/serial.h +++ b/nuttx/include/nuttx/serial/serial.h @@ -220,7 +220,6 @@ struct uart_dev_s #ifndef CONFIG_DISABLE_POLL struct pollfd *fds[CONFIG_SERIAL_NPOLLWAITERS]; #endif -<<<<<<< HEAD /* Terminal control flags */ @@ -230,8 +229,6 @@ struct uart_dev_s tcflag_t tc_lflag; /* Local modes */ #endif -======= ->>>>>>> 049c93446561c6ad3e59183c139f3916230ddee5 }; typedef struct uart_dev_s uart_dev_t; |