From 4933ddb0516122064a89de5956d6d01878e21477 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Nov 2023 16:26:49 +0000 Subject: [PATCH] ANDROID: fix up 6.1.60 merge of hid.h into android14-6.1-lts In commit 59aa39697fc2 ("HID: input: map battery system charging"), the battery_charge_status field was added, but that had already come into the branch due to an earlier backport of the same commit, 28ee91ed2bb0 ("UPSTREAM: HID: input: map battery system charging"), and then moved to a different location in the structure in 8a67c0609445 ("ANDROID: GKI: fix ABI breakage in struct hid_device"). Because of that, we had two copies of the same variable in the same structure as git didn't know to remove it, so remove it by hand to fix up the merge and build. Fixes: 59aa39697fc2 ("HID: input: map battery system charging") Fixes: 8a67c0609445 ("ANDROID: GKI: fix ABI breakage in struct hid_device") Fixes: 28ee91ed2bb0 ("UPSTREAM: HID: input: map battery system charging") Signed-off-by: Greg Kroah-Hartman Change-Id: I89d50f885fd064033fd30609f83193298be45b02 --- include/linux/hid.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/hid.h b/include/linux/hid.h index 3c6df1498eb3..9420731114e5 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -617,7 +617,6 @@ struct hid_device { /* device report descriptor */ __s32 battery_max; __s32 battery_report_type; __s32 battery_report_id; - __s32 battery_charge_status; enum hid_battery_status battery_status; bool battery_avoid_query; ktime_t battery_ratelimit_time;