commit 89f95a8175816f6d225f402ded04b7cbf765640b
author Jason Hobbs <jason.hobbs@calxeda.com> Wed Jun 29 06:25:14 2011 +0000
committer Wolfgang Denk <wd@denx.de> Mon Jul 25 23:27:43 2011 +0200
tree 269f3e465e9135499917aa50073710a024f124ca
parent c7c60108c29f4ab5666317b7293899c556b3aea9

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>

common/main.c

diff --git a/common/main.c b/common/main.c
index 2730c6f..01931a1 100644
--- a/common/main.c
+++ b/common/main.c
@@ -56,10 +56,6 @@
 
 #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 @@
  */
 #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 int menukey = 0;
 #endif
 
-static __inline__ int abortboot(int bootdelay)
+static inline int abortboot(int bootdelay)
 {
 	int abort = 0;