summaryrefslogtreecommitdiff
path: root/include/linux/power
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-03-25 11:32:29 +0100
committerIngo Molnar <mingo@kernel.org>2024-03-25 11:32:29 +0100
commitf4566a1e73957800df75a3dd2dccee8a4697f327 (patch)
treeb043b875228c0b25988af66c680d60cae69d761d /include/linux/power
parentb9e6e28663928cab836a19abbdec3d036a07db3b (diff)
parent4cece764965020c22cff7665b18a012006359095 (diff)
downloadlwn-f4566a1e73957800df75a3dd2dccee8a4697f327.tar.gz
lwn-f4566a1e73957800df75a3dd2dccee8a4697f327.zip
Merge tag 'v6.9-rc1' into sched/core, to pick up fixes and to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/power')
-rw-r--r--include/linux/power/bq27xxx_battery.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h
index 7d8025fb74b7..b9e5bd2b42d3 100644
--- a/include/linux/power/bq27xxx_battery.h
+++ b/include/linux/power/bq27xxx_battery.h
@@ -61,7 +61,6 @@ struct bq27xxx_reg_cache {
struct bq27xxx_device_info {
struct device *dev;
- int id;
enum bq27xxx_chip chip;
u32 opts;
const char *name;