diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-15 02:03:33 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-15 02:03:33 +0000 |
commit | c1a162433f5694f2ff3bea4258bdbd3141712ba1 (patch) | |
tree | ad288b530a514a2dbcc580ecd367ffbc8dcba91c /nuttx/configs/lm3s6965-ek | |
parent | abcc509bf98d1a87b05ee17dffa700ffaacaf30b (diff) | |
download | px4-nuttx-c1a162433f5694f2ff3bea4258bdbd3141712ba1.tar.gz px4-nuttx-c1a162433f5694f2ff3bea4258bdbd3141712ba1.tar.bz2 px4-nuttx-c1a162433f5694f2ff3bea4258bdbd3141712ba1.zip |
Update locking in lm3s SPI driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2670 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/lm3s6965-ek')
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h | 2 | ||||
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/up_boot.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 07a0aa3fe..17a791ea4 100755 --- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h @@ -135,7 +135,7 @@ extern void weak_function lm3s_ssiinitialize(void); ************************************************************************************/
#ifdef CONFIG_NX_LCDDRIVER
-extern void weak_function lm3s_oledinitialize(void);
+extern void lm3s_oledinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
diff --git a/nuttx/configs/lm3s6965-ek/src/up_boot.c b/nuttx/configs/lm3s6965-ek/src/up_boot.c index 3e8f54fbf..d4ab263d5 100755 --- a/nuttx/configs/lm3s6965-ek/src/up_boot.c +++ b/nuttx/configs/lm3s6965-ek/src/up_boot.c @@ -85,10 +85,7 @@ void lm3s_boardinitialize(void) /* Configure the OLED for use */
#ifdef CONFIG_NX_LCDDRIVER
- if (lm3s_oledinitialize)
- {
- lm3s_oledinitialize();
- }
+ lm3s_oledinitialize();
#endif
#endif
|