diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-28 04:22:06 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-28 04:22:06 -0400 |
| commit | 37c14e83ee173cc3f6310d80f00f2e588c402b61 (patch) | |
| tree | 462ec551d7e3fc48ed016009ebf2f911f1e0d5c0 | |
| parent | e4f2dfbb5e92be4e46c0625f4f8eb101110f756f (diff) | |
m68k: Update defconfigs for v3.9
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/configs/amiga_defconfig | 230 | ||||
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 215 | ||||
| -rw-r--r-- | arch/m68k/configs/atari_defconfig | 227 | ||||
| -rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 217 | ||||
| -rw-r--r-- | arch/m68k/configs/hp300_defconfig | 214 | ||||
| -rw-r--r-- | arch/m68k/configs/mac_defconfig | 234 | ||||
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 264 | ||||
| -rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 215 | ||||
| -rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 216 | ||||
| -rw-r--r-- | arch/m68k/configs/q40_defconfig | 229 | ||||
| -rw-r--r-- | arch/m68k/configs/sun3_defconfig | 209 | ||||
| -rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 210 |
12 files changed, 1982 insertions, 698 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 90d3109c82f4..19325e117eea 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
| @@ -1,55 +1,78 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-amiga" | 1 | CONFIG_LOCALVERSION="-amiga" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_AMIGA=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_ATARI_PARTITION=y | ||
| 18 | CONFIG_MAC_PARTITION=y | ||
| 19 | CONFIG_BSD_DISKLABEL=y | ||
| 20 | CONFIG_MINIX_SUBPARTITION=y | ||
| 21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 23 | CONFIG_SUN_PARTITION=y | ||
| 24 | # CONFIG_EFI_PARTITION is not set | ||
| 25 | CONFIG_SYSV68_PARTITION=y | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
| 15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
| 16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
| 17 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
| 18 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_AMIGA=y |
| 19 | CONFIG_BINFMT_MISC=m | ||
| 20 | CONFIG_ZORRO=y | 32 | CONFIG_ZORRO=y |
| 21 | CONFIG_AMIGA_PCMCIA=y | 33 | CONFIG_AMIGA_PCMCIA=y |
| 22 | CONFIG_HEARTBEAT=y | ||
| 23 | CONFIG_PROC_HARDWARE=y | ||
| 24 | CONFIG_ZORRO_NAMES=y | 34 | CONFIG_ZORRO_NAMES=y |
| 35 | # CONFIG_COMPACTION is not set | ||
| 36 | CONFIG_CLEANCACHE=y | ||
| 37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 38 | CONFIG_BINFMT_AOUT=m | ||
| 39 | CONFIG_BINFMT_MISC=m | ||
| 25 | CONFIG_NET=y | 40 | CONFIG_NET=y |
| 26 | CONFIG_PACKET=y | 41 | CONFIG_PACKET=y |
| 42 | CONFIG_PACKET_DIAG=m | ||
| 27 | CONFIG_UNIX=y | 43 | CONFIG_UNIX=y |
| 44 | CONFIG_UNIX_DIAG=m | ||
| 45 | CONFIG_XFRM_MIGRATE=y | ||
| 28 | CONFIG_NET_KEY=y | 46 | CONFIG_NET_KEY=y |
| 29 | CONFIG_NET_KEY_MIGRATE=y | ||
| 30 | CONFIG_INET=y | 47 | CONFIG_INET=y |
| 31 | CONFIG_IP_PNP=y | 48 | CONFIG_IP_PNP=y |
| 49 | CONFIG_IP_PNP_DHCP=y | ||
| 50 | CONFIG_IP_PNP_BOOTP=y | ||
| 51 | CONFIG_IP_PNP_RARP=y | ||
| 32 | CONFIG_NET_IPIP=m | 52 | CONFIG_NET_IPIP=m |
| 53 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 33 | CONFIG_NET_IPGRE=m | 54 | CONFIG_NET_IPGRE=m |
| 34 | CONFIG_SYN_COOKIES=y | 55 | CONFIG_SYN_COOKIES=y |
| 56 | CONFIG_NET_IPVTI=m | ||
| 35 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
| 36 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
| 37 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
| 38 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 60 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 39 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 61 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 40 | CONFIG_INET_XFRM_MODE_BEET=m | 62 | CONFIG_INET_XFRM_MODE_BEET=m |
| 63 | # CONFIG_INET_LRO is not set | ||
| 41 | CONFIG_INET_DIAG=m | 64 | CONFIG_INET_DIAG=m |
| 65 | CONFIG_INET_UDP_DIAG=m | ||
| 42 | CONFIG_IPV6_PRIVACY=y | 66 | CONFIG_IPV6_PRIVACY=y |
| 43 | CONFIG_IPV6_ROUTER_PREF=y | 67 | CONFIG_IPV6_ROUTER_PREF=y |
| 44 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 45 | CONFIG_INET6_AH=m | 68 | CONFIG_INET6_AH=m |
| 46 | CONFIG_INET6_ESP=m | 69 | CONFIG_INET6_ESP=m |
| 47 | CONFIG_INET6_IPCOMP=m | 70 | CONFIG_INET6_IPCOMP=m |
| 48 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 71 | CONFIG_IPV6_GRE=m |
| 49 | CONFIG_IPV6_TUNNEL=m | ||
| 50 | CONFIG_NETFILTER=y | 72 | CONFIG_NETFILTER=y |
| 51 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 52 | CONFIG_NF_CONNTRACK=m | 73 | CONFIG_NF_CONNTRACK=m |
| 74 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 75 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 53 | # CONFIG_NF_CT_PROTO_DCCP is not set | 76 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 54 | CONFIG_NF_CT_PROTO_UDPLITE=m | 77 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 55 | CONFIG_NF_CONNTRACK_AMANDA=m | 78 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -57,25 +80,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 57 | CONFIG_NF_CONNTRACK_H323=m | 80 | CONFIG_NF_CONNTRACK_H323=m |
| 58 | CONFIG_NF_CONNTRACK_IRC=m | 81 | CONFIG_NF_CONNTRACK_IRC=m |
| 59 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 82 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 83 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 60 | CONFIG_NF_CONNTRACK_PPTP=m | 84 | CONFIG_NF_CONNTRACK_PPTP=m |
| 61 | CONFIG_NF_CONNTRACK_SANE=m | 85 | CONFIG_NF_CONNTRACK_SANE=m |
| 62 | CONFIG_NF_CONNTRACK_SIP=m | 86 | CONFIG_NF_CONNTRACK_SIP=m |
| 63 | CONFIG_NF_CONNTRACK_TFTP=m | 87 | CONFIG_NF_CONNTRACK_TFTP=m |
| 88 | CONFIG_NETFILTER_XT_SET=m | ||
| 89 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 64 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 90 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 91 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 92 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 93 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 94 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 95 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 67 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 96 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 68 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 97 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 98 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 99 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 100 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 70 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 101 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 71 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 102 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 72 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 103 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 104 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 105 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 73 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 106 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 107 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 109 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 77 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 111 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 112 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 113 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 79 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 114 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 80 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 115 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 81 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 116 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -86,6 +121,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 86 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 121 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 87 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 122 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 123 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 124 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 125 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 89 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 126 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 90 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 127 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 91 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 128 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -99,22 +136,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 99 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 136 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_ | ||
