diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-30 13:43:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-30 13:43:57 -0400 |
commit | 3b775e2246ae861daec276d3229a7de2af69b7db (patch) | |
tree | 6d2811f0742beea2358df19e93e9dff5f935d230 /arch/x86 | |
parent | c8618d16f91f58c01be4bdbec4d724efe426a081 (diff) | |
parent | aeb0aea143e958d5218162d73b1ed4d6ff0ed7c4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: update author email for at32ap700x_wdt
watchdog: gef_wdt: fix MODULE_ALIAS
watchdog: Intel SCU Watchdog: Fix build and remove duplicate code
watchdog: mtx1-wdt: fix section mismatch
watchdog: mtx1-wdt: fix GPIO toggling
watchdog: mtx1-wdt: request gpio before using it
watchdog: Handle multiple wm831x watchdogs being registered
Diffstat (limited to 'arch/x86')
-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 */ |