diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
| commit | 87045b033a62777337ae4aa62834876da09b5fb5 (patch) | |
| tree | 26aefd28e436668ff906e42b1e0d75c056e33e01 /arch/x86/include/asm/apb_timer.h | |
| parent | 0d83ab65ff1b54ce8b6cd172285cf71a38c4cceb (diff) | |
| parent | bfe159a51203c15d23cb3158fffdc25ec4b4dda1 (diff) | |
Merge branch 'scsi-fixes'
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; | |||
| 62 | #else /* CONFIG_APB_TIMER */ | 62 | #else /* CONFIG_APB_TIMER */ |
| 63 | 63 | ||
| 64 | static inline unsigned long apbt_quick_calibrate(void) {return 0; } | 64 | static inline unsigned long apbt_quick_calibrate(void) {return 0; } |
| 65 | static inline void apbt_time_init(void) {return 0; } | 65 | static inline void apbt_time_init(void) { } |
| 66 | 66 | ||
| 67 | #endif | 67 | #endif |
| 68 | #endif /* ASM_X86_APBT_H */ | 68 | #endif /* ASM_X86_APBT_H */ |