diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:18:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:18:13 +1100 |
| commit | d7a73baafcdb2de8ef1d9063e0e74b54a3261987 (patch) | |
| tree | 757b670bbb30ad3cbf4862432f30a591078ef9b8 /include | |
| parent | eacfd5c3f46afd9621bc91f70938e88c3eb616c1 (diff) | |
| parent | 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 (diff) | |
Merge remote branch 'workqueues/for-next'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/media/video/bt8xx/bttv-input.c
drivers/rtc/rtc-dev.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/workqueue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index bd257fee6031..1ac11586a2f5 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -409,7 +409,7 @@ static inline bool __cancel_delayed_work(struct delayed_work *work) } /* Obsolete. use cancel_delayed_work_sync() */ -static inline +static inline __deprecated void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, struct delayed_work *work) { @@ -417,7 +417,7 @@ void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, } /* Obsolete. use cancel_delayed_work_sync() */ -static inline +static inline __deprecated void cancel_rearming_delayed_work(struct delayed_work *work) { cancel_delayed_work_sync(work); |