From fd527676dd4c9ff72be08721136971dd58253615 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 11 Feb 2019 14:06:39 +0000
Subject: [PATCH] rmi4: Disable RMI_F54

Enabling this symbol makes rmi4_core depend on the media/v4l2
subsystem which is not only weird but also results in duplicate
modules at kernel-wedge time.
---
 debian/changelog     | 2 +-
 debian/config/config | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e233af48f..be74a89f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -435,7 +435,7 @@ linux (4.19.20-1) UNRELEASED; urgency=medium
   * [x86] pinctrl: Enable PINCTRL_CANNONLAKE, PINCTRL_CEDARFORK,
     PINCTRL_DENVERTON, PINCTRL_GEMINILAKE, PINCTRL_ICELAKE, PINCTRL_LEWISBURG
   * [x86] rmi4: Re-enable RMI4_CORE, RMI4_SMB as modules (Closes: #875621);
-    RMI4_F03, RMI4_F11, RMI4_F12, RMI4_F30, RMI4_F34, RMI4_F54, RMI4_F55
+    RMI4_F03, RMI4_F11, RMI4_F12, RMI4_F30, RMI4_F34, RMI4_F55
   * xfrm: Enable XFRM_INTERFACE as module
   * PCI: Enable PCI_PF_STUB as module
   * ptp: Change PTP_1588_CLOCK_KVM from built-in to module
diff --git a/debian/config/config b/debian/config/config
index 37e2c98e0..ef69db3b7 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1654,7 +1654,8 @@ CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 CONFIG_RMI4_F34=y
-CONFIG_RMI4_F54=y
+#. Enabling this makes input-modules pull in media/v4l2
+# CONFIG_RMI4_F54 is not set
 CONFIG_RMI4_F55=y
 
 ##