projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
include
/
asm
/
apb_timer.h
diff --git
a/arch/x86/include/asm/apb_timer.h
b/arch/x86/include/asm/apb_timer.h
index 963f7d4877813ed0d4d34e8379f0923ab25f3018..082cf818493599380fe6d5c70437b7a1e18cea57 100644
(file)
--- a/
arch/x86/include/asm/apb_timer.h
+++ b/
arch/x86/include/asm/apb_timer.h
@@
-61,7
+61,7
@@
extern int sfi_mtimer_num;
#else /* CONFIG_APB_TIMER */
static inline unsigned long apbt_quick_calibrate(void) {return 0; }
-static inline void apbt_time_init(void) {
return 0;
}
+static inline void apbt_time_init(void) { }
#endif
#endif /* ASM_X86_APBT_H */