diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-10 07:18:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-10 07:18:59 +0300 |
| commit | b33c3b84045e880d8a7596f260860038c71cf393 (patch) | |
| tree | 44981364aebf72db58091e58c427ad26577aa29d /include/linux | |
| parent | c48953d81972bfe16a9e3551883992aa6efe541a (diff) | |
| parent | cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 (diff) | |
| download | linux-b33c3b84045e880d8a7596f260860038c71cf393.tar.xz | |
Merge tag 'm68k-for-v7.0-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- Add missing put_device() in the NuBus driver
- Replace vsprintf() with vsnprintf() on Sun-3
* tag 'm68k-for-v7.0-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: sun3: Replace vsprintf() with bounded vsnprintf()
nubus: Call put_device() in bus initialization error path
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nubus.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index 4d103ac8f5c7..b8710c825d64 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h @@ -162,8 +162,7 @@ void nubus_seq_write_rsrc_mem(struct seq_file *m, unsigned char *nubus_dirptr(const struct nubus_dirent *nd); /* Declarations relating to driver model objects */ -int nubus_parent_device_register(void); -int nubus_device_register(struct nubus_board *board); +int nubus_device_register(struct device *parent, struct nubus_board *board); int nubus_driver_register(struct nubus_driver *ndrv); void nubus_driver_unregister(struct nubus_driver *ndrv); int nubus_proc_show(struct seq_file *m, void *data); |