diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-04 00:00:19 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-04 00:00:19 +0000 |
| commit | 613f281fc9e425b18eca5c9db333a62068a3cacc (patch) | |
| tree | a65a4216e038127a89bc3fabe69741f6a2e17322 /nuttx | |
| parent | d9ac685b16bf68a3b66996ea43d6d345159f2208 (diff) | |
| download | nuttx-613f281fc9e425b18eca5c9db333a62068a3cacc.tar.gz nuttx-613f281fc9e425b18eca5c9db333a62068a3cacc.tar.bz2 nuttx-613f281fc9e425b18eca5c9db333a62068a3cacc.zip | |
Fix for compilation issues reported by Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5702 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-serial.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/nucleus2g/src/up_boot.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/olimex-lpc1766stk/ftpc/appconfig | 3 | ||||
| -rw-r--r-- | nuttx/configs/olimex-lpc1766stk/src/up_lcd.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_ssp.c | 1 |
5 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c b/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c index 6b3ee6a7b..0254051d2 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c @@ -188,7 +188,7 @@ static bool up_txempty(struct uart_dev_s *dev); * Private Variables ****************************************************************************/ -static const struct struct uart_ops_s g_uart_ops = +static const struct uart_ops_s g_uart_ops = { .setup = up_setup, .shutdown = up_shutdown, diff --git a/nuttx/configs/nucleus2g/src/up_boot.c b/nuttx/configs/nucleus2g/src/up_boot.c index 4718e9f82..7c1242c33 100644 --- a/nuttx/configs/nucleus2g/src/up_boot.c +++ b/nuttx/configs/nucleus2g/src/up_boot.c @@ -48,6 +48,8 @@ #include "up_internal.h" #include "lpc17_ssp.h" +#include "lpc17_gpio.h" + #include "nucleus2g_internal.h" /************************************************************************************ diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig index 41b612b3e..21aff6538 100644 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig @@ -47,9 +47,10 @@ CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib CONFIGURED_APPS += netutils/ftpc -# Optional networking support +# Additional networking support CONFIGURED_APPS += netutils/uiplib +CONFIGURED_APPS += netutils/resolv ifeq ($(CONFIG_NSH_TELNET),y) CONFIGURED_APPS += netutils/telnetd diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c index 4e4c94856..24ee83f51 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c @@ -50,8 +50,8 @@ #include <nuttx/lcd/nokia6100.h> #include "up_arch.h" -#include "lpc17_syscon.h" -#include "lpc17_pwm.h" +#include "chip/lpc17_syscon.h" +#include "chip/lpc17_pwm.h" #include "lpc17_gpio.h" #include "lpc1766stk_internal.h" diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c index 41fc0b344..40ca55601 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c +++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c @@ -55,6 +55,7 @@ #include "up_arch.h" #include "chip.h" #include "lpc17_ssp.h" +#include "lpc17_gpio.h" #include "zkitarm_internal.h" #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) |