diff --git a/Makefile b/Makefile
index 0ff21532..a6124f3c 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,9 @@ subdir-ccflags-y += -DNV_ASOC_XXX_DROP
 
 # drm_debugfs_remove_files has root argument
 subdir-ccflags-y += -DNV_DRM_DEBUGFS_REMOVE_HAS_ROOT_ARGS
+
+# pwm ops has dropped the .owner member
+subdir-ccflags-y += -DNV_PWM_OPS_HAS_NO_OWNER
 endif
 
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
diff --git a/drivers/media/platform/tegra/cdi/cdi_pwm.c b/drivers/media/platform/tegra/cdi/cdi_pwm.c
index fc2fc2f0..f2eff877 100644
--- a/drivers/media/platform/tegra/cdi/cdi_pwm.c
+++ b/drivers/media/platform/tegra/cdi/cdi_pwm.c
@@ -130,7 +130,9 @@ static const struct pwm_ops cdi_pwm_ops = {
 	.enable = cdi_pwm_enable,
 	.disable = cdi_pwm_disable,
 #endif
+#if !defined(NV_PWM_OPS_HAS_NO_OWNER)
 	.owner = THIS_MODULE,
+#endif
 };
 
 static int cdi_pwm_probe(struct platform_device *pdev)
diff --git a/drivers/media/platform/tegra/isc/isc_pwm.c b/drivers/media/platform/tegra/isc/isc_pwm.c
index 8cb129d8..3e4e055a 100644
--- a/drivers/media/platform/tegra/isc/isc_pwm.c
+++ b/drivers/media/platform/tegra/isc/isc_pwm.c
@@ -130,7 +130,9 @@ static const struct pwm_ops isc_pwm_ops = {
 	.enable = isc_pwm_enable,
 	.disable = isc_pwm_disable,
 #endif
+#if !defined(NV_PWM_OPS_HAS_NO_OWNER)
 	.owner = THIS_MODULE,
+#endif
 };
 
 static int isc_pwm_probe(struct platform_device *pdev)
diff --git a/drivers/pwm/pwm-tegra-tachometer.c b/drivers/pwm/pwm-tegra-tachometer.c
index 3de12efb..81da0a7f 100644
--- a/drivers/pwm/pwm-tegra-tachometer.c
+++ b/drivers/pwm/pwm-tegra-tachometer.c
@@ -316,7 +316,9 @@ static const struct pwm_ops pwm_tegra_tach_ops = {
 	.apply = tegra_pwm_apply,
 #endif
 	.capture = pwm_tegra_tacho_capture,
+#if !defined(NV_PWM_OPS_HAS_NO_OWNER)
 	.owner = THIS_MODULE,
+#endif
 };
 
 static void pwm_tegra_tach_read_platform_data(struct pwm_tegra_tach *ptt)