diff options
| author | Jason Hobbs <jason.hobbs@calxeda.com> | 2011-06-29 06:25:14 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-25 23:27:43 +0200 |
| commit | 3c766dccb38a71afa5702271bec5d2d416d87386 (patch) | |
| tree | 269f3e465e9135499917aa50073710a024f124ca /common | |
| parent | f0ece9e93447bb600689eb1a41dbcc99560b333d (diff) | |
| download | u-boot-3c766dccb38a71afa5702271bec5d2d416d87386.zip u-boot-3c766dccb38a71afa5702271bec5d2d416d87386.tar.gz u-boot-3c766dccb38a71afa5702271bec5d2d416d87386.tar.bz2 | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/main.c | 8 |
1 files changed, 2 insertions, 6 deletions
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 @@ 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; |