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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/nubus.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index bdcd85e622d8..4d103ac8f5c7 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h @@ -89,8 +89,6 @@ struct nubus_driver { void (*remove)(struct nubus_board *board); }; -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; |