diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-12 20:27:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-12 20:27:52 +0300 |
| commit | 508f34f2381eb84b2335abb970b940aefef50a19 (patch) | |
| tree | dbc04028924e9c094b74c130348721c02129648e /drivers | |
| parent | 691632f0e86973604678d193ccfa47b9614581aa (diff) | |
| parent | e8a7824856def1c8608401b0d7d05566d6e81c95 (diff) | |
| download | linux-508f34f2381eb84b2335abb970b940aefef50a19.tar.xz | |
Merge tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- Make the Zorro bus type constant
- defconfig updates
* tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v6.8-rc1
zorro: Make zorro_bus_type const
Diffstat (limited to 'drivers')
| -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 025edfccedcf..f49d19977e82 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 f84df9fb4c20..df44e35203fd 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 |