diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-08 16:25:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-08 16:25:46 -0800 |
| commit | 3cf1d6a5fbf3f724d12b01635319924239d42c00 (patch) | |
| tree | 312d7fd553d47f6925258d0aa68a9c12b43678e3 /drivers | |
| parent | 968b80332432172dbbb773e749a43bdc846d1a13 (diff) | |
| parent | 6b9c045b0602cf64b33ea6da5e6aa6f81dd47ae8 (diff) | |
Merge tag 'm68k-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- make the NuBus bus type static and constant
- defconfig updates
* tag 'm68k-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v6.7-rc1
nubus: Make nubus_bus_type static and constant
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nubus/bus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nubus/bus.c b/drivers/nubus/bus.c index 72921e4f35f6..12df4d88970c 100644 --- a/drivers/nubus/bus.c +++ b/drivers/nubus/bus.c @@ -32,12 +32,11 @@ static void nubus_device_remove(struct device *dev) ndrv->remove(to_nubus_board(dev)); } -struct bus_type nubus_bus_type = { +static const struct bus_type nubus_bus_type = { .name = "nubus", .probe = nubus_device_probe, .remove = nubus_device_remove, }; -EXPORT_SYMBOL(nubus_bus_type); int nubus_driver_register(struct nubus_driver *ndrv) { |