]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-6.1/hid-input-map-battery-system-charging.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Oct 2023 09:02:42 +0000 (11:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Oct 2023 09:02:42 +0000 (11:02 +0200)
The Kconfig change was dropped by quilt :(

queue-6.1/hid-input-map-battery-system-charging.patch

index 2ac4926975abcd0f55802994df5ef8ec8a782a86..da43c2a0fbef750a652c2e8f5abc402f80d17baa 100644 (file)
@@ -26,10 +26,11 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/hid/.kunitconfig     |    1 
+ drivers/hid/Kconfig          |    1 
  drivers/hid/hid-input-test.c |   80 +++++++++++++++++++++++++++++++++++++++++++
  drivers/hid/hid-input.c      |   36 ++++++++++++++++++-
  include/linux/hid.h          |    2 +
4 files changed, 117 insertions(+), 2 deletions(-)
5 files changed, 118 insertions(+), 2 deletions(-)
  create mode 100644 drivers/hid/hid-input-test.c
 
 --- a/drivers/hid/.kunitconfig
@@ -41,6 +42,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +CONFIG_HID_BATTERY_STRENGTH=y
  CONFIG_HID_UCLOGIC=y
  CONFIG_HID_KUNIT_TEST=y
+--- a/drivers/hid/Kconfig
++++ b/drivers/hid/Kconfig
+@@ -1263,6 +1263,7 @@ config HID_MCP2221
+ config HID_KUNIT_TEST
+       tristate "KUnit tests for HID" if !KUNIT_ALL_TESTS
+       depends on KUNIT
++      depends on HID_BATTERY_STRENGTH
+       depends on HID_UCLOGIC
+       default KUNIT_ALL_TESTS
+       help
 --- /dev/null
 +++ b/drivers/hid/hid-input-test.c
 @@ -0,0 +1,80 @@