Merge "adv7481: Remove conditional compilation for PM functions" (0181952b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/i2c/adv7481.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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,