diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:27 +0000 |
| commit | 34996e42f82bfd60bc2c191e5cae3c6ab233ec6c (patch) | |
| tree | 62db60558cbf089714b48daeabca82bf2b20b20e /drivers/zorro | |
| parent | Adding debian version 6.8.12-1. (diff) | |
| download | linux-34996e42f82bfd60bc2c191e5cae3c6ab233ec6c.tar.xz linux-34996e42f82bfd60bc2c191e5cae3c6ab233ec6c.zip | |
Merging upstream version 6.9.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 2 | ||||
| -rw-r--r-- | drivers/zorro/zorro.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index 025edfcced..f49d19977e 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c @@ -150,7 +150,7 @@ static int zorro_uevent(const struct device *dev, struct kobj_uevent_env *env) return 0; } -struct bus_type zorro_bus_type = { +const struct bus_type zorro_bus_type = { .name = "zorro", .dev_name = "zorro", .dev_groups = zorro_device_attribute_groups, diff --git a/drivers/zorro/zorro.h b/drivers/zorro/zorro.h index f84df9fb4c..df44e35203 100644 --- a/drivers/zorro/zorro.h +++ b/drivers/zorro/zorro.h @@ -4,7 +4,7 @@ * Zorro bus */ -extern struct bus_type zorro_bus_type; +extern const struct bus_type zorro_bus_type; #ifdef CONFIG_ZORRO_NAMES |