diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-27 03:04:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-27 03:04:03 +0300 |
| commit | f810c182366acd2eb7eb5efb3c06b1fc9f719835 (patch) | |
| tree | 2f34f64b128af0809f054aadb6e88b88f42a3232 /include | |
| parent | 19300488c9d9c9ed539ab3f4f1bfc0050c9a4482 (diff) | |
| parent | 4055eabe04a26f5d113b5a02588b20b5e166a753 (diff) | |
| download | linux-f810c182366acd2eb7eb5efb3c06b1fc9f719835.tar.xz | |
Merge tag 'm68k-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- miscellaneous NuBus fixes and improvements
- defconfig updates
* tag 'm68k-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v6.4-rc1
nubus: Don't list slot resources by default
nubus: Remove proc entries before adding them
nubus: Partially revert proc_create_single_data() conversion
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nubus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index 392fc6c53e96..bdcd85e622d8 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h @@ -93,6 +93,7 @@ extern struct bus_type nubus_bus_type; /* Generic NuBus interface functions, modelled after the PCI interface */ #ifdef CONFIG_PROC_FS +extern bool nubus_populate_procfs; void nubus_proc_init(void); struct proc_dir_entry *nubus_proc_add_board(struct nubus_board *board); struct proc_dir_entry *nubus_proc_add_rsrc_dir(struct proc_dir_entry *procdir, |