diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 19:37:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 19:37:43 +0300 |
| commit | f7301270a29fb3b5b2f3ab73ef63a208e21f783a (patch) | |
| tree | 930e93399567e6340dbdcb88aaaaac008ce70563 /drivers | |
| parent | 173ea743bf7a9eef04460e03b00ba267cc52aee2 (diff) | |
| parent | aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a (diff) | |
| download | linux-f7301270a29fb3b5b2f3ab73ef63a208e21f783a.tar.xz | |
Merge tag 'm68k-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- defconfig updates
- miscellaneous fixes and improvements
* tag 'm68k-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: kexec: Include <linux/reboot.h>
m68k: defconfig: Update defconfigs for v6.3-rc1
m68k: Remove obsolete config NO_KERNEL_MSG
nubus: Drop noop match function
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nubus/bus.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/nubus/bus.c b/drivers/nubus/bus.c index 17fad660032c..72921e4f35f6 100644 --- a/drivers/nubus/bus.c +++ b/drivers/nubus/bus.c @@ -14,11 +14,6 @@ #define to_nubus_board(d) container_of(d, struct nubus_board, dev) #define to_nubus_driver(d) container_of(d, struct nubus_driver, driver) -static int nubus_bus_match(struct device *dev, struct device_driver *driver) -{ - return 1; -} - static int nubus_device_probe(struct device *dev) { struct nubus_driver *ndrv = to_nubus_driver(dev->driver); @@ -39,7 +34,6 @@ static void nubus_device_remove(struct device *dev) struct bus_type nubus_bus_type = { .name = "nubus", - .match = nubus_bus_match, .probe = nubus_device_probe, .remove = nubus_device_remove, }; |