Skip to content

L
linux
Commit 3cf1d6a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
parents 968b8033 6b9c045b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 22 deletions
arch/m68k/configs/amiga_defconfig
View file @ 3cf1d6a5
...@@ -453,6 +453,7 @@ CONFIG_REISERFS_FS=m ...@@ -453,6 +453,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -550,7 +551,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -550,7 +551,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/apollo_defconfig
View file @ 3cf1d6a5
...@@ -410,6 +410,7 @@ CONFIG_REISERFS_FS=m ...@@ -410,6 +410,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -507,7 +508,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -507,7 +508,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/atari_defconfig
View file @ 3cf1d6a5
...@@ -430,6 +430,7 @@ CONFIG_REISERFS_FS=m ...@@ -430,6 +430,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -527,7 +528,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -527,7 +528,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ 3cf1d6a5
...@@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m ...@@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/hp300_defconfig
View file @ 3cf1d6a5
...@@ -412,6 +412,7 @@ CONFIG_REISERFS_FS=m ...@@ -412,6 +412,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -509,7 +510,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -509,7 +510,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/mac_defconfig
View file @ 3cf1d6a5
...@@ -269,9 +269,6 @@ CONFIG_RDS_TCP=m ...@@ -269,9 +269,6 @@ CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_BRIDGE=m CONFIG_BRIDGE=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_6LOWPAN=m CONFIG_6LOWPAN=m
CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
CONFIG_6LOWPAN_GHC_UDP=m CONFIG_6LOWPAN_GHC_UDP=m
...@@ -432,6 +429,7 @@ CONFIG_REISERFS_FS=m ...@@ -432,6 +429,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -529,7 +527,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -529,7 +527,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/multi_defconfig
View file @ 3cf1d6a5
...@@ -289,9 +289,6 @@ CONFIG_RDS_TCP=m ...@@ -289,9 +289,6 @@ CONFIG_RDS_TCP=m
CONFIG_L2TP=m CONFIG_L2TP=m
CONFIG_BRIDGE=m CONFIG_BRIDGE=m
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_6LOWPAN=m CONFIG_6LOWPAN=m
CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
CONFIG_6LOWPAN_GHC_UDP=m CONFIG_6LOWPAN_GHC_UDP=m
...@@ -518,6 +515,7 @@ CONFIG_REISERFS_FS=m ...@@ -518,6 +515,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -615,7 +613,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -615,7 +613,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/mvme147_defconfig
View file @ 3cf1d6a5
...@@ -401,6 +401,7 @@ CONFIG_REISERFS_FS=m ...@@ -401,6 +401,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -498,7 +499,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -498,7 +499,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ 3cf1d6a5
...@@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m ...@@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/q40_defconfig
View file @ 3cf1d6a5
...@@ -419,6 +419,7 @@ CONFIG_REISERFS_FS=m ...@@ -419,6 +419,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -516,7 +517,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -516,7 +517,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/sun3_defconfig
View file @ 3cf1d6a5
...@@ -400,6 +400,7 @@ CONFIG_REISERFS_FS=m ...@@ -400,6 +400,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -497,7 +498,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -497,7 +498,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
arch/m68k/configs/sun3x_defconfig
View file @ 3cf1d6a5
...@@ -400,6 +400,7 @@ CONFIG_REISERFS_FS=m ...@@ -400,6 +400,7 @@ CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_BCACHEFS_FS=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_AUTOFS_FS=m CONFIG_AUTOFS_FS=m
...@@ -497,7 +498,6 @@ CONFIG_NLS_MAC_TURKISH=m ...@@ -497,7 +498,6 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
......
drivers/nubus/bus.c
View file @ 3cf1d6a5
...@@ -32,12 +32,11 @@ static void nubus_device_remove(struct device *dev) ...@@ -32,12 +32,11 @@ static void nubus_device_remove(struct device *dev)
ndrv->remove(to_nubus_board(dev)); ndrv->remove(to_nubus_board(dev));
} }
struct bus_type nubus_bus_type = { static const struct bus_type nubus_bus_type = {
.name = "nubus", .name = "nubus",
.probe = nubus_device_probe, .probe = nubus_device_probe,
.remove = nubus_device_remove, .remove = nubus_device_remove,
}; };
EXPORT_SYMBOL(nubus_bus_type);
int nubus_driver_register(struct nubus_driver *ndrv) int nubus_driver_register(struct nubus_driver *ndrv)
{ {
......
include/linux/nubus.h
View file @ 3cf1d6a5
...@@ -89,8 +89,6 @@ struct nubus_driver { ...@@ -89,8 +89,6 @@ struct nubus_driver {
void (*remove)(struct nubus_board *board); void (*remove)(struct nubus_board *board);
}; };
extern struct bus_type nubus_bus_type;
/* Generic NuBus interface functions, modelled after the PCI interface */ /* Generic NuBus interface functions, modelled after the PCI interface */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern bool nubus_populate_procfs; extern bool nubus_populate_procfs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7