mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
Pull bugzilla-9194 into release branch
This commit is contained in:
commit
02d5bccf8e
6 changed files with 17 additions and 22 deletions
|
|
@ -246,6 +246,15 @@ static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
|
|||
device_set_wakeup_enable(dev,val); \
|
||||
} while(0)
|
||||
|
||||
/*
|
||||
* Global Power Management flags
|
||||
* Used to keep APM and ACPI from both being active
|
||||
*/
|
||||
extern unsigned int pm_flags;
|
||||
|
||||
#define PM_APM 1
|
||||
#define PM_ACPI 2
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _LINUX_PM_H */
|
||||
|
|
|
|||
|
|
@ -4,10 +4,6 @@
|
|||
|
||||
#ifdef CONFIG_PM_LEGACY
|
||||
|
||||
extern int pm_active;
|
||||
|
||||
#define PM_IS_ACTIVE() (pm_active != 0)
|
||||
|
||||
/*
|
||||
* Register a device with power management
|
||||
*/
|
||||
|
|
@ -21,8 +17,6 @@ int __deprecated pm_send_all(pm_request_t rqst, void *data);
|
|||
|
||||
#else /* CONFIG_PM_LEGACY */
|
||||
|
||||
#define PM_IS_ACTIVE() 0
|
||||
|
||||
static inline struct pm_dev *pm_register(pm_dev_t type,
|
||||
unsigned long id,
|
||||
pm_callback callback)
|
||||
|
|
|
|||
Loading…
Reference in a new issue