diff --git a/[refs] b/[refs]
index 1f19a2d503ea..a8aa2da2a83d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b168e810b0e8bef68ccdfb06f741cb4d7142578c
+refs/heads/master: f1c16adce0d2a14376dcafd00c90a88c885b4fed
diff --git a/trunk/drivers/media/platform/marvell-ccic/mcam-core.h b/trunk/drivers/media/platform/marvell-ccic/mcam-core.h
index 5e802c6b398e..6c53ac9681da 100644
--- a/trunk/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/trunk/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -15,15 +15,15 @@
  * Create our own symbols for the supported buffer modes, but, for now,
  * base them entirely on which videobuf2 options have been selected.
  */
-#if defined(CONFIG_VIDEOBUF2_VMALLOC) || defined(CONFIG_VIDEOBUF2_VMALLOC_MODULE)
+#if IS_ENABLED(CONFIG_VIDEOBUF2_VMALLOC)
 #define MCAM_MODE_VMALLOC 1
 #endif
 
-#if defined(CONFIG_VIDEOBUF2_DMA_CONTIG) || defined(CONFIG_VIDEOBUF2_DMA_CONTIG_MODULE)
+#if IS_ENABLED(CONFIG_VIDEOBUF2_DMA_CONTIG)
 #define MCAM_MODE_DMA_CONTIG 1
 #endif
 
-#if defined(CONFIG_VIDEOBUF2_DMA_SG) || defined(CONFIG_VIDEOBUF2_DMA_SG_MODULE)
+#if IS_ENABLED(CONFIG_VIDEOBUF2_DMA_SG)
 #define MCAM_MODE_DMA_SG 1
 #endif