diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-07 13:39:38 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-07 13:39:38 -0700 |
| commit | bc67f799e7667fb3c00286f2415c3cc44a253aec (patch) | |
| tree | 271ae5f17012caafe3d3ac3daf0776808b71cf48 /arch/x86/include/asm/apb_timer.h | |
| parent | 89c6143263ef8e14e42e17324a234418d8030b10 (diff) | |
| parent | c7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a (diff) | |
| download | blackbird-op-linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.tar.gz blackbird-op-linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/x86/include/asm/apb_timer.h')
| -rw-r--r-- | arch/x86/include/asm/apb_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apb_timer.h b/arch/x86/include/asm/apb_timer.h index 2fefa501d3ba..af60d8a2e288 100644 --- a/arch/x86/include/asm/apb_timer.h +++ b/arch/x86/include/asm/apb_timer.h @@ -62,7 +62,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 */ |
