mirror of
https://github.com/torvalds/linux
synced 2024-10-14 23:39:09 +00:00
m68k updates for v6.8
- Make the NuBus bus type static and constant, - Defconfig updates. -----BEGIN PGP SIGNATURE----- iIsEABYIADMWIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCZZvbjxUcZ2VlcnRAbGlu dXgtbTY4ay5vcmcACgkQisJQ/WRJ8XAuUQEA+33Rf+OcQR7ehJK1DxNEUrMoh8X1 dyCL335404zypJkBALCHPD7USK4Y6DOwmVVQv6TZ04SagCYtbS6ReK5Iw5UH =hmHh -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
3cf1d6a5fb
|
@ -453,6 +453,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -550,7 +551,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -410,6 +410,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -507,7 +508,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -430,6 +430,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -527,7 +528,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -412,6 +412,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -509,7 +510,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -269,9 +269,6 @@ CONFIG_RDS_TCP=m
|
|||
CONFIG_L2TP=m
|
||||
CONFIG_BRIDGE=m
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_6LOWPAN=m
|
||||
CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
|
||||
CONFIG_6LOWPAN_GHC_UDP=m
|
||||
|
@ -432,6 +429,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -529,7 +527,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -289,9 +289,6 @@ CONFIG_RDS_TCP=m
|
|||
CONFIG_L2TP=m
|
||||
CONFIG_BRIDGE=m
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_6LOWPAN=m
|
||||
CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
|
||||
CONFIG_6LOWPAN_GHC_UDP=m
|
||||
|
@ -518,6 +515,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -615,7 +613,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -401,6 +401,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -498,7 +499,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -402,6 +402,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -499,7 +500,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -419,6 +419,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -516,7 +517,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -400,6 +400,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -497,7 +498,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -400,6 +400,7 @@ CONFIG_REISERFS_FS=m
|
|||
CONFIG_JFS_FS=m
|
||||
CONFIG_OCFS2_FS=m
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
CONFIG_BCACHEFS_FS=m
|
||||
CONFIG_FANOTIFY=y
|
||||
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
||||
CONFIG_AUTOFS_FS=m
|
||||
|
@ -497,7 +498,6 @@ CONFIG_NLS_MAC_TURKISH=m
|
|||
CONFIG_DLM=m
|
||||
CONFIG_ENCRYPTED_KEYS=m
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_TEST=m
|
||||
|
|
|
@ -32,12 +32,11 @@ static void nubus_device_remove(struct device *dev)
|
|||
ndrv->remove(to_nubus_board(dev));
|
||||
}
|
||||
|
||||
struct bus_type nubus_bus_type = {
|
||||
static const struct bus_type nubus_bus_type = {
|
||||
.name = "nubus",
|
||||
.probe = nubus_device_probe,
|
||||
.remove = nubus_device_remove,
|
||||
};
|
||||
EXPORT_SYMBOL(nubus_bus_type);
|
||||
|
||||
int nubus_driver_register(struct nubus_driver *ndrv)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue