diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-15 14:14:38 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-15 14:14:38 -0800 |
| commit | 0181952bf7ea8b67f543cfb07cd898a80af0cb68 (patch) | |
| tree | 0a852f740504e36735b13f90e42e4bd1f96c7f74 | |
| parent | 89db7216b2f5dfd362c44d7187842705ee708a0d (diff) | |
| parent | 626fb980b050c38070201f5f78bde51b897517f0 (diff) | |
Merge "adv7481: Remove conditional compilation for PM functions"
| -rw-r--r-- | drivers/media/i2c/adv7481.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/i2c/adv7481.c b/drivers/media/i2c/adv7481.c index 74d7b9584827..19c237e8a286 100644 --- a/drivers/media/i2c/adv7481.c +++ b/drivers/media/i2c/adv7481.c @@ -2449,7 +2449,6 @@ static int adv7481_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int adv7481_suspend(struct device *dev) { struct adv7481_state *state; @@ -2487,10 +2486,6 @@ static int adv7481_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(adv7481_pm_ops, adv7481_suspend, adv7481_resume); #define ADV7481_PM_OPS (&adv7481_pm_ops) -#else -#define ADV7481_PM_OPS NULL -#endif - static struct platform_driver adv7481_driver = { .driver = { .owner = THIS_MODULE, |