From 2ebf287bf711c9976f211cf59dd7d137a805e962 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 13 Apr 2020 08:56:58 -0700
Subject: [PATCH] ANDROID: GKI: add hidden V4L2_MEM2MEM_DEV

Solve ABI issue with struct v4l2_fh

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 151246806
Bug: 153738240
Bug: 151399858
Change-Id: I9671a692b1b8450ff2f6266cc9dde9e6fb0c9297
---
 init/Kconfig.gki | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index 82d0d65b373f..2f7699b2a903 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -89,10 +89,11 @@ config GKI_HIDDEN_SOC_PM_CONFIGS
 
 config GKI_HIDDEN_VIDEOBUF2_CONFIGS
 	bool "Hidden v4l2 configs for GKI"
+	select V4L2_MEM2MEM_DEV if VIDEO_V4L2
 	select VIDEOBUF2_CORE if VIDEO_V4L2
 	select VIDEOBUF2_V4L2 if VIDEO_V4L2
-	select VIDEOBUF2_MEMOPS if VIDEO_V4L2
 	select VIDEOBUF2_VMALLOC if VIDEO_V4L2
+	select VIDEOBUF2_MEMOPS if VIDEO_V4L2
 	help
 	  Dummy config option used to enable all the hidden v4l2 media module.