aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Hobbs <jason.hobbs@calxeda.com>2011-06-29 11:25:14 -0500
committerJohn Rigby <john.rigby@linaro.org>2011-06-30 12:23:34 +0100
commitd1bb2ca5567c4831e57e0f9964a5f3630d2310e6 (patch)
treed91ad3a82f0941c4de845da4e93bbb6875d6a890
parent4f29f39ac4e9850a96b870fc5adaf3cbb75050f1 (diff)
downloadu-boot-linaro-stable-d1bb2ca5567c4831e57e0f9964a5f3630d2310e6.tar.gz
cosmetic, main: clean up declarations of abortboot
Remove an unneeded prototype declaration from the top of main.c, and use plain inline instead of __inline__ to please checkpatch. Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
-rw-r--r--common/main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/common/main.c b/common/main.c
index 2730c6f22..01931a1bf 100644
--- a/common/main.c
+++ b/common/main.c
@@ -56,10 +56,6 @@ void update_tftp (void);
#define MAX_DELAY_STOP_STR 32
-#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
-static int abortboot(int);
-#endif
-
#undef DEBUG_PARSER
char console_buffer[CONFIG_SYS_CBSIZE + 1]; /* console I/O buffer */
@@ -91,7 +87,7 @@ extern void mdm_init(void); /* defined in board.c */
*/
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
# if defined(CONFIG_AUTOBOOT_KEYED)
-static __inline__ int abortboot(int bootdelay)
+static inline int abortboot(int bootdelay)
{
int abort = 0;
uint64_t etime = endtick(bootdelay);
@@ -205,7 +201,7 @@ static __inline__ int abortboot(int bootdelay)
static int menukey = 0;
#endif
-static __inline__ int abortboot(int bootdelay)
+static inline int abortboot(int bootdelay)
{
int abort = 0;