Commit 7b8ba82a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/defconfig: Update defconfigs for v4.6-rc2 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 0eb2c80c

arch/m68k/configs/amiga_defconfig

+6 −7
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-amiga"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_LOG_BUF_SHIFT=16
@@ -64,7 +63,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m
@@ -285,7 +283,9 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -359,6 +359,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -452,6 +453,7 @@ CONFIG_JFS_FS=m 
CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -468,6 +470,7 @@ CONFIG_VFAT_FS=m 
CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_ORANGEFS_FS=m

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m

CONFIG_ECRYPT_FS_MESSAGING=y
@@ -549,6 +552,7 @@ CONFIG_TEST_HEXDUMP=m 
CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -557,7 +561,6 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m
@@ -565,12 +568,9 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m
@@ -594,7 +594,6 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/apollo_defconfig

+6 −7
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-apollo"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_LOG_BUF_SHIFT=16
@@ -62,7 +61,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m
@@ -283,7 +281,9 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -341,6 +341,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -411,6 +412,7 @@ CONFIG_JFS_FS=m 
CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -427,6 +429,7 @@ CONFIG_VFAT_FS=m 
CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_ORANGEFS_FS=m

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m

CONFIG_ECRYPT_FS_MESSAGING=y
@@ -508,6 +511,7 @@ CONFIG_TEST_HEXDUMP=m 
CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -516,7 +520,6 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m
@@ -524,12 +527,9 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m
@@ -553,7 +553,6 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/atari_defconfig

+6 −7
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-atari"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_LOG_BUF_SHIFT=16
@@ -62,7 +61,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m
@@ -283,7 +281,9 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -350,6 +350,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -432,6 +433,7 @@ CONFIG_JFS_FS=m 
CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -448,6 +450,7 @@ CONFIG_VFAT_FS=m 
CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_ORANGEFS_FS=m

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m

CONFIG_ECRYPT_FS_MESSAGING=y
@@ -529,6 +532,7 @@ CONFIG_TEST_HEXDUMP=m 
CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -537,7 +541,6 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m
@@ -545,12 +548,9 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m
@@ -574,7 +574,6 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/bvme6000_defconfig

+6 −7
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-bvme6000"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_LOG_BUF_SHIFT=16
@@ -60,7 +59,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m
@@ -281,7 +279,9 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -340,6 +340,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -403,6 +404,7 @@ CONFIG_JFS_FS=m 
CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -419,6 +421,7 @@ CONFIG_VFAT_FS=m 
CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_ORANGEFS_FS=m

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m

CONFIG_ECRYPT_FS_MESSAGING=y
@@ -500,6 +503,7 @@ CONFIG_TEST_HEXDUMP=m 
CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -508,7 +512,6 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m
@@ -516,12 +519,9 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m
@@ -545,7 +545,6 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

arch/m68k/configs/hp300_defconfig

+6 −7
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-hp300"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_LOG_BUF_SHIFT=16
@@ -62,7 +61,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m
@@ -283,7 +281,9 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_NET_DEVLINK=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -341,6 +341,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -413,6 +414,7 @@ CONFIG_JFS_FS=m 
CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FS_ENCRYPTION=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -429,6 +431,7 @@ CONFIG_VFAT_FS=m 
CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_ORANGEFS_FS=m

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m

CONFIG_ECRYPT_FS_MESSAGING=y
@@ -510,6 +513,7 @@ CONFIG_TEST_HEXDUMP=m 
CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m
@@ -518,7 +522,6 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m
@@ -526,12 +529,9 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m
@@ -555,7 +555,6 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m