diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-10 18:06:54 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-03-14 19:43:15 -0400 |
| commit | aa33860158114d0df3c7997bc1dd41c0168e1c2a (patch) | |
| tree | a1ae98c42232835780618b0a5dea78c5478ed58c /include/linux/pm.h | |
| parent | 196ec243224bb38fc5c41d9fa4050f70708b7fb4 (diff) | |
PM: Remove CONFIG_PM_OPS
After redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP ||
CONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be
replaced with CONFIG_PM.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 21415cc91cbb..9279175a4557 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -267,7 +267,7 @@ const struct dev_pm_ops name = { \ | |||
| 267 | * callbacks provided by device drivers supporting both the system sleep PM and | 267 | * callbacks provided by device drivers supporting both the system sleep PM and |
| 268 | * runtime PM, make the pm member point to generic_subsys_pm_ops. | 268 | * runtime PM, make the pm member point to generic_subsys_pm_ops. |
| 269 | */ | 269 | */ |
| 270 | #ifdef CONFIG_PM_OPS | 270 | #ifdef CONFIG_PM |
| 271 | extern struct dev_pm_ops generic_subsys_pm_ops; | 271 | extern struct dev_pm_ops generic_subsys_pm_ops; |
| 272 | #define GENERIC_SUBSYS_PM_OPS (&generic_subsys_pm_ops) | 272 | #define GENERIC_SUBSYS_PM_OPS (&generic_subsys_pm_ops) |
| 273 | #else | 273 | #else |