diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 10:34:26 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:48 +0200 |
| commit | 99fa20f5d167cf0de12b505ab0e63d87b14b6215 (patch) | |
| tree | ec5569d7307b51ebff314424231d34a1abb1fea4 | |
| parent | dc0cdf5c8e89647d27cafa8766cb87efa8897b45 (diff) | |
backports: override pm_wakeup_event() on 2.6.36
This may not be the right thing to do, but it resolves
linking the TI driver on 2.6.36 where pm_wakeup_event()
is declared but not always exported.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | backport/backport-include/linux/device.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/backport/backport-include/linux/device.h b/backport/backport-include/linux/device.h index f672a99b..f37dbab7 100644 --- a/backport/backport-include/linux/device.h +++ b/backport/backport-include/linux/device.h @@ -88,8 +88,15 @@ do { \ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) #define device_rename(dev, new_name) device_rename(dev, (char *)new_name) +#endif -/* this belongs into pm_wakeup.h but that isn't included directly */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) +/* + * This belongs into pm_wakeup.h but that isn't included directly. + * Note that on 2.6.36, this was defined but not exported, so we + * need to override it. + */ +#define pm_wakeup_event LINUX_BACKPORT(pm_wakeup_event) static inline void pm_wakeup_event(struct device *dev, unsigned int msec) {} #endif |