diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-06 15:07:12 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-06 15:07:12 +0800 |
| commit | 4becc339ef23d54b39139a85bb6e33b7f27d67d1 (patch) | |
| tree | 583571dd15b19d2e0592e15ff5ffee6e9c24ab6c /include | |
| parent | f072008f5a29068baa0bc1febad8aaf2840e2568 (diff) | |
| parent | 180c995fa9dfd1912e199d908ae55b2b8c479d13 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
drivers/video/mxc/ldb.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clockchips.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index d6733e27af34..acc14353dea5 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -151,6 +151,12 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) freq, minsec); } +#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT) +extern int tick_check_broadcast_pending(void); +#else +static inline int tick_check_broadcast_pending(void) { return 0; } +#endif + #ifdef CONFIG_GENERIC_CLOCKEVENTS extern void clockevents_notify(unsigned long reason, void *arg); #else |