diff options
author | David S. Miller <davem@davemloft.net> | 2013-06-05 18:56:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-05 19:37:30 -0400 |
commit | 6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2 (patch) | |
tree | 8b049ef383307f5dae91b5c9cf78dbfb9b74a4d1 /arch/m68k/configs/amiga_defconfig | |
parent | 11a164a04382d735230b01f4cc46ad78a7c4abf6 (diff) | |
parent | 4d3797d7e1861ac1af150a6189315786c5e1c820 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.
This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge. Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/m68k/configs/amiga_defconfig')
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 230 |
1 files changed, 173 insertions, 57 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_TIME=m | 137 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
101 | CONFIG_NETFILTER_XT_MATCH_U32=m | 138 | CONFIG_NETFILTER_XT_MATCH_U32=m |
139 | CONFIG_IP_SET=m | ||
140 | CONFIG_IP_SET_BITMAP_IP=m | ||
141 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
142 | CONFIG_IP_SET_BITMAP_PORT=m | ||
143 | CONFIG_IP_SET_HASH_IP=m | ||
144 | CONFIG_IP_SET_HASH_IPPORT=m | ||
145 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
146 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
147 | CONFIG_IP_SET_HASH_NET=m | ||
148 | CONFIG_IP_SET_HASH_NETPORT=m | ||
149 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
150 | CONFIG_IP_SET_LIST_SET=m | ||
102 | CONFIG_NF_CONNTRACK_IPV4=m | 151 | CONFIG_NF_CONNTRACK_IPV4=m |
103 | CONFIG_IP_NF_QUEUE=m | ||
104 | CONFIG_IP_NF_IPTABLES=m | 152 | CONFIG_IP_NF_IPTABLES=m |
105 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
106 | CONFIG_IP_NF_MATCH_AH=m | 153 | CONFIG_IP_NF_MATCH_AH=m |
107 | CONFIG_IP_NF_MATCH_ECN=m | 154 | CONFIG_IP_NF_MATCH_ECN=m |
155 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
108 | CONFIG_IP_NF_MATCH_TTL=m | 156 | CONFIG_IP_NF_MATCH_TTL=m |
109 | CONFIG_IP_NF_FILTER=m | 157 | CONFIG_IP_NF_FILTER=m |
110 | CONFIG_IP_NF_TARGET_REJECT=m | 158 | CONFIG_IP_NF_TARGET_REJECT=m |
111 | CONFIG_IP_NF_TARGET_LOG=m | ||
112 | CONFIG_IP_NF_TARGET_ULOG=m | 159 | CONFIG_IP_NF_TARGET_ULOG=m |
113 | CONFIG_NF_NAT=m | 160 | CONFIG_NF_NAT_IPV4=m |
114 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 161 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
115 | CONFIG_IP_NF_TARGET_NETMAP=m | 162 | CONFIG_IP_NF_TARGET_NETMAP=m |
116 | CONFIG_IP_NF_TARGET_REDIRECT=m | 163 | CONFIG_IP_NF_TARGET_REDIRECT=m |
117 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
118 | CONFIG_IP_NF_MANGLE=m | 164 | CONFIG_IP_NF_MANGLE=m |
119 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 165 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
120 | CONFIG_IP_NF_TARGET_ECN=m | 166 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -124,7 +170,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
124 | CONFIG_IP_NF_ARPFILTER=m | 170 | CONFIG_IP_NF_ARPFILTER=m |
125 | CONFIG_IP_NF_ARP_MANGLE=m | 171 | CONFIG_IP_NF_ARP_MANGLE=m |
126 | CONFIG_NF_CONNTRACK_IPV6=m | 172 | CONFIG_NF_CONNTRACK_IPV6=m |
127 | CONFIG_IP6_NF_QUEUE=m | ||
128 | CONFIG_IP6_NF_IPTABLES=m | 173 | CONFIG_IP6_NF_IPTABLES=m |
129 | CONFIG_IP6_NF_MATCH_AH=m | 174 | CONFIG_IP6_NF_MATCH_AH=m |
130 | CONFIG_IP6_NF_MATCH_EUI64=m | 175 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -133,18 +178,30 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
133 | CONFIG_IP6_NF_MATCH_HL=m | 178 | CONFIG_IP6_NF_MATCH_HL=m |
134 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 179 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
135 | CONFIG_IP6_NF_MATCH_MH=m | 180 | CONFIG_IP6_NF_MATCH_MH=m |
181 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
136 | CONFIG_IP6_NF_MATCH_RT=m | 182 | CONFIG_IP6_NF_MATCH_RT=m |
137 | CONFIG_IP6_NF_TARGET_HL=m | 183 | CONFIG_IP6_NF_TARGET_HL=m |
138 | CONFIG_IP6_NF_TARGET_LOG=m | ||
139 | CONFIG_IP6_NF_FILTER=m | 184 | CONFIG_IP6_NF_FILTER=m |
140 | CONFIG_IP6_NF_TARGET_REJECT=m | 185 | CONFIG_IP6_NF_TARGET_REJECT=m |
141 | CONFIG_IP6_NF_MANGLE=m | 186 | CONFIG_IP6_NF_MANGLE=m |
142 | CONFIG_IP6_NF_RAW=m | 187 | CONFIG_IP6_NF_RAW=m |
188 | CONFIG_NF_NAT_IPV6=m | ||
189 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
190 | CONFIG_IP6_NF_TARGET_NPT=m | ||
143 | CONFIG_IP_DCCP=m | 191 | CONFIG_IP_DCCP=m |
144 | # CONFIG_IP_DCCP_CCID3 is not set | 192 | # CONFIG_IP_DCCP_CCID3 is not set |
193 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
194 | CONFIG_RDS=m | ||
195 | CONFIG_RDS_TCP=m | ||
196 | CONFIG_L2TP=m | ||
145 | CONFIG_ATALK=m | 197 | CONFIG_ATALK=m |
198 | CONFIG_BATMAN_ADV=m | ||
199 | CONFIG_BATMAN_ADV_DAT=y | ||
200 | # CONFIG_WIRELESS is not set | ||
146 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 201 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
202 | CONFIG_DEVTMPFS=y | ||
147 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 203 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
204 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
148 | CONFIG_CONNECTOR=m | 205 | CONFIG_CONNECTOR=m |
149 | CONFIG_PARPORT=m | 206 | CONFIG_PARPORT=m |
150 | CONFIG_PARPORT_AMIGA=m | 207 | CONFIG_PARPORT_AMIGA=m |
@@ -154,11 +211,13 @@ CONFIG_AMIGA_FLOPPY=y | |||
154 | CONFIG_AMIGA_Z2RAM=y | 211 | CONFIG_AMIGA_Z2RAM=y |
155 | CONFIG_BLK_DEV_LOOP=y | 212 | CONFIG_BLK_DEV_LOOP=y |
156 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 213 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
214 | CONFIG_BLK_DEV_DRBD=m | ||
157 | CONFIG_BLK_DEV_NBD=m | 215 | CONFIG_BLK_DEV_NBD=m |
158 | CONFIG_BLK_DEV_RAM=y | 216 | CONFIG_BLK_DEV_RAM=y |
159 | CONFIG_CDROM_PKTCDVD=m | 217 | CONFIG_CDROM_PKTCDVD=m |
160 | CONFIG_ATA_OVER_ETH=m | 218 | CONFIG_ATA_OVER_ETH=m |
161 | CONFIG_IDE=y | 219 | CONFIG_IDE=y |
220 | CONFIG_IDE_GD_ATAPI=y | ||
162 | CONFIG_BLK_DEV_IDECD=y | 221 | CONFIG_BLK_DEV_IDECD=y |
163 | CONFIG_BLK_DEV_GAYLE=y | 222 | CONFIG_BLK_DEV_GAYLE=y |
164 | CONFIG_BLK_DEV_BUDDHA=y | 223 | CONFIG_BLK_DEV_BUDDHA=y |
@@ -172,57 +231,77 @@ CONFIG_BLK_DEV_SR=y | |||
172 | CONFIG_BLK_DEV_SR_VENDOR=y | 231 | CONFIG_BLK_DEV_SR_VENDOR=y |
173 | CONFIG_CHR_DEV_SG=m | 232 | CONFIG_CHR_DEV_SG=m |
174 | CONFIG_SCSI_CONSTANTS=y | 233 | CONFIG_SCSI_CONSTANTS=y |
175 | CONFIG_SCSI_SAS_LIBSAS=m | 234 | CONFIG_SCSI_SAS_ATTRS=m |
176 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
177 | CONFIG_SCSI_SRP_ATTRS=m | ||
178 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
179 | CONFIG_ISCSI_TCP=m | 235 | CONFIG_ISCSI_TCP=m |
236 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
180 | CONFIG_A3000_SCSI=y | 237 | CONFIG_A3000_SCSI=y |
181 | CONFIG_A2091_SCSI=y | 238 | CONFIG_A2091_SCSI=y |
182 | CONFIG_GVP11_SCSI=y | 239 | CONFIG_GVP11_SCSI=y |
183 | CONFIG_SCSI_A4000T=y | 240 | CONFIG_SCSI_A4000T=y |
184 | CONFIG_SCSI_ZORRO7XX=y | 241 | CONFIG_SCSI_ZORRO7XX=y |
185 | CONFIG_MD=y | 242 | CONFIG_MD=y |
186 | CONFIG_BLK_DEV_MD=m | ||
187 | CONFIG_MD_LINEAR=m | 243 | CONFIG_MD_LINEAR=m |
188 | CONFIG_MD_RAID0=m | 244 | CONFIG_MD_RAID0=m |
189 | CONFIG_MD_RAID1=m | ||
190 | CONFIG_MD_RAID456=m | ||
191 | CONFIG_BLK_DEV_DM=m | 245 | CONFIG_BLK_DEV_DM=m |
192 | CONFIG_DM_CRYPT=m | 246 | CONFIG_DM_CRYPT=m |
193 | CONFIG_DM_SNAPSHOT=m | 247 | CONFIG_DM_SNAPSHOT=m |
248 | CONFIG_DM_THIN_PROVISIONING=m | ||
249 | CONFIG_DM_CACHE=m | ||
194 | CONFIG_DM_MIRROR=m | 250 | CONFIG_DM_MIRROR=m |
251 | CONFIG_DM_RAID=m | ||
195 | CONFIG_DM_ZERO=m | 252 | CONFIG_DM_ZERO=m |
196 | CONFIG_DM_MULTIPATH=m | 253 | CONFIG_DM_MULTIPATH=m |
197 | CONFIG_DM_UEVENT=y | 254 | CONFIG_DM_UEVENT=y |
255 | CONFIG_TARGET_CORE=m | ||
256 | CONFIG_TCM_IBLOCK=m | ||
257 | CONFIG_TCM_FILEIO=m | ||
258 | CONFIG_TCM_PSCSI=m | ||
198 | CONFIG_NETDEVICES=y | 259 | CONFIG_NETDEVICES=y |
199 | CONFIG_DUMMY=m | 260 | CONFIG_DUMMY=m |
200 | CONFIG_MACVLAN=m | ||
201 | CONFIG_EQUALIZER=m | 261 | CONFIG_EQUALIZER=m |
262 | CONFIG_NET_TEAM=m | ||
263 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
264 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
265 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
266 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
267 | CONFIG_VXLAN=m | ||
268 | CONFIG_NETCONSOLE=m | ||
269 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
202 | CONFIG_VETH=m | 270 | CONFIG_VETH=m |
203 | CONFIG_NET_ETHERNET=y | 271 | # CONFIG_NET_VENDOR_3COM is not set |
204 | CONFIG_ARIADNE=y | ||
205 | CONFIG_A2065=y | 272 | CONFIG_A2065=y |
273 | CONFIG_ARIADNE=y | ||
274 | # CONFIG_NET_CADENCE is not set | ||
275 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
276 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
277 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
278 | # CONFIG_NET_VENDOR_HP is not set | ||
279 | # CONFIG_NET_VENDOR_INTEL is not set | ||
280 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
281 | # CONFIG_NET_VENDOR_MICREL is not set | ||
206 | CONFIG_HYDRA=y | 282 | CONFIG_HYDRA=y |
207 | CONFIG_ZORRO8390=y | ||
208 | CONFIG_APNE=y | 283 | CONFIG_APNE=y |
209 | # CONFIG_NETDEV_1000 is not set | 284 | CONFIG_ZORRO8390=y |
210 | # CONFIG_NETDEV_10000 is not set | 285 | # CONFIG_NET_VENDOR_SEEQ is not set |
286 | # CONFIG_NET_VENDOR_SMSC is not set | ||
287 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
288 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
211 | CONFIG_PPP=m | 289 | CONFIG_PPP=m |
212 | CONFIG_PPP_FILTER=y | ||
213 | CONFIG_PPP_ASYNC=m | ||
214 | CONFIG_PPP_SYNC_TTY=m | ||
215 | CONFIG_PPP_DEFLATE=m | ||
216 | CONFIG_PPP_BSDCOMP=m | 290 | CONFIG_PPP_BSDCOMP=m |
291 | CONFIG_PPP_DEFLATE=m | ||
292 | CONFIG_PPP_FILTER=y | ||
217 | CONFIG_PPP_MPPE=m | 293 | CONFIG_PPP_MPPE=m |
218 | CONFIG_PPPOE=m | 294 | CONFIG_PPPOE=m |
295 | CONFIG_PPTP=m | ||
296 | CONFIG_PPPOL2TP=m | ||
297 | CONFIG_PPP_ASYNC=m | ||
298 | CONFIG_PPP_SYNC_TTY=m | ||
219 | CONFIG_SLIP=m | 299 | CONFIG_SLIP=m |
220 | CONFIG_SLIP_COMPRESSED=y | 300 | CONFIG_SLIP_COMPRESSED=y |
221 | CONFIG_SLIP_SMART=y | 301 | CONFIG_SLIP_SMART=y |
222 | CONFIG_SLIP_MODE_SLIP6=y | 302 | CONFIG_SLIP_MODE_SLIP6=y |
223 | CONFIG_NETCONSOLE=m | 303 | # CONFIG_WLAN is not set |
224 | CONFIG_NETCONSOLE_DYNAMIC=y | 304 | CONFIG_INPUT_EVDEV=m |
225 | CONFIG_INPUT_FF_MEMLESS=m | ||
226 | CONFIG_KEYBOARD_AMIGA=y | 305 | CONFIG_KEYBOARD_AMIGA=y |
227 | # CONFIG_KEYBOARD_ATKBD is not set | 306 | # CONFIG_KEYBOARD_ATKBD is not set |
228 | # CONFIG_MOUSE_PS2 is not set | 307 | # CONFIG_MOUSE_PS2 is not set |
@@ -233,11 +312,14 @@ CONFIG_INPUT_MISC=y | |||
233 | CONFIG_INPUT_M68K_BEEP=m | 312 | CONFIG_INPUT_M68K_BEEP=m |
234 | # CONFIG_SERIO is not set | 313 | # CONFIG_SERIO is not set |
235 | CONFIG_VT_HW_CONSOLE_BINDING=y | 314 | CONFIG_VT_HW_CONSOLE_BINDING=y |
315 | # CONFIG_LEGACY_PTYS is not set | ||
236 | # CONFIG_DEVKMEM is not set | 316 | # CONFIG_DEVKMEM is not set |
237 | CONFIG_PRINTER=m | 317 | CONFIG_PRINTER=m |
238 | # CONFIG_HW_RANDOM is not set | 318 | # CONFIG_HW_RANDOM is not set |
239 | CONFIG_GEN_RTC=m | 319 | CONFIG_NTP_PPS=y |
240 | CONFIG_GEN_RTC_X=y | 320 | CONFIG_PPS_CLIENT_LDISC=m |
321 | CONFIG_PPS_CLIENT_PARPORT=m | ||
322 | CONFIG_PTP_1588_CLOCK=m | ||
241 | # CONFIG_HWMON is not set | 323 | # CONFIG_HWMON is not set |
242 | CONFIG_FB=y | 324 | CONFIG_FB=y |
243 | CONFIG_FB_CIRRUS=y | 325 | CONFIG_FB_CIRRUS=y |
@@ -252,48 +334,64 @@ CONFIG_SOUND=m | |||
252 | CONFIG_DMASOUND_PAULA=m | 334 | CONFIG_DMASOUND_PAULA=m |
253 | CONFIG_HID=m | 335 | CONFIG_HID=m |
254 | CONFIG_HIDRAW=y | 336 | CONFIG_HIDRAW=y |
337 | CONFIG_UHID=m | ||
338 | # CONFIG_HID_GENERIC is not set | ||
255 | # CONFIG_USB_SUPPORT is not set | 339 | # CONFIG_USB_SUPPORT is not set |
340 | CONFIG_RTC_CLASS=y | ||
341 | CONFIG_RTC_DRV_MSM6242=m | ||
342 | CONFIG_RTC_DRV_RP5C01=m | ||
343 | # CONFIG_IOMMU_SUPPORT is not set | ||
344 | CONFIG_HEARTBEAT=y | ||
345 | CONFIG_PROC_HARDWARE=y | ||
256 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 346 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
257 | CONFIG_SERIAL_CONSOLE=y | 347 | CONFIG_SERIAL_CONSOLE=y |
258 | CONFIG_EXT2_FS=y | 348 | CONFIG_EXT2_FS=y |
259 | CONFIG_EXT3_FS=y | 349 | CONFIG_EXT3_FS=y |
260 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 350 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
261 | # CONFIG_EXT3_FS_XATTR is not set | 351 | # CONFIG_EXT3_FS_XATTR is not set |
352 | CONFIG_EXT4_FS=y | ||
262 | CONFIG_REISERFS_FS=m | 353 | CONFIG_REISERFS_FS=m |
263 | CONFIG_JFS_FS=m | 354 | CONFIG_JFS_FS=m |
264 | CONFIG_XFS_FS=m | 355 | CONFIG_XFS_FS=m |
265 | CONFIG_OCFS2_FS=m | 356 | CONFIG_OCFS2_FS=m |
266 | # CONFIG_OCFS2_FS_STATS is not set | ||
267 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 357 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
358 | CONFIG_FANOTIFY=y | ||
268 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 359 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
269 | # CONFIG_PRINT_QUOTA_WARNING is not set | 360 | # CONFIG_PRINT_QUOTA_WARNING is not set |
270 | CONFIG_AUTOFS_FS=m | ||
271 | CONFIG_AUTOFS4_FS=m | 361 | CONFIG_AUTOFS4_FS=m |
272 | CONFIG_FUSE_FS=m | 362 | CONFIG_FUSE_FS=m |
363 | CONFIG_CUSE=m | ||
273 | CONFIG_ISO9660_FS=y | 364 | CONFIG_ISO9660_FS=y |
274 | CONFIG_JOLIET=y | 365 | CONFIG_JOLIET=y |
275 | CONFIG_ZISOFS=y | 366 | CONFIG_ZISOFS=y |
276 | CONFIG_UDF_FS=m | 367 | CONFIG_UDF_FS=m |
277 | CONFIG_MSDOS_FS=y | 368 | CONFIG_MSDOS_FS=m |
278 | CONFIG_VFAT_FS=m | 369 | CONFIG_VFAT_FS=m |
279 | CONFIG_PROC_KCORE=y | 370 | CONFIG_PROC_KCORE=y |
280 | CONFIG_TMPFS=y | 371 | CONFIG_TMPFS=y |
281 | CONFIG_AFFS_FS=m | 372 | CONFIG_AFFS_FS=m |
373 | CONFIG_ECRYPT_FS=m | ||
374 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
282 | CONFIG_HFS_FS=m | 375 | CONFIG_HFS_FS=m |
283 | CONFIG_HFSPLUS_FS=m | 376 | CONFIG_HFSPLUS_FS=m |
284 | CONFIG_CRAMFS=m | 377 | CONFIG_CRAMFS=m |
285 | CONFIG_SQUASHFS=m | 378 | CONFIG_SQUASHFS=m |
286 | CONFIG_MINIX_FS=y | 379 | CONFIG_SQUASHFS_LZO=y |
380 | CONFIG_MINIX_FS=m | ||
381 | CONFIG_OMFS_FS=m | ||
287 | CONFIG_HPFS_FS=m | 382 | CONFIG_HPFS_FS=m |
383 | CONFIG_QNX4FS_FS=m | ||
384 | CONFIG_QNX6FS_FS=m | ||
288 | CONFIG_SYSV_FS=m | 385 | CONFIG_SYSV_FS=m |
289 | CONFIG_UFS_FS=m | 386 | CONFIG_UFS_FS=m |
290 | CONFIG_NFS_FS=y | 387 | CONFIG_NFS_FS=y |
291 | CONFIG_NFS_V3=y | ||
292 | CONFIG_NFS_V4=y | 388 | CONFIG_NFS_V4=y |
389 | CONFIG_NFS_SWAP=y | ||
390 | CONFIG_ROOT_NFS=y | ||
293 | CONFIG_NFSD=m | 391 | CONFIG_NFSD=m |
294 | CONFIG_NFSD_V3=y | 392 | CONFIG_NFSD_V3=y |
295 | CONFIG_SMB_FS=m | 393 | CONFIG_CIFS=m |
296 | CONFIG_SMB_NLS_DEFAULT=y | 394 | # CONFIG_CIFS_DEBUG is not set |
297 | CONFIG_CODA_FS=m | 395 | CONFIG_CODA_FS=m |
298 | CONFIG_NLS_CODEPAGE_437=y | 396 | CONFIG_NLS_CODEPAGE_437=y |
299 | CONFIG_NLS_CODEPAGE_737=m | 397 | CONFIG_NLS_CODEPAGE_737=m |
@@ -332,10 +430,23 @@ CONFIG_NLS_ISO8859_14=m | |||
332 | CONFIG_NLS_ISO8859_15=m | 430 | CONFIG_NLS_ISO8859_15=m |
333 | CONFIG_NLS_KOI8_R=m | 431 | CONFIG_NLS_KOI8_R=m |
334 | CONFIG_NLS_KOI8_U=m | 432 | CONFIG_NLS_KOI8_U=m |
433 | CONFIG_NLS_MAC_ROMAN=m | ||
434 | CONFIG_NLS_MAC_CELTIC=m | ||
435 | CONFIG_NLS_MAC_CENTEURO=m | ||
436 | CONFIG_NLS_MAC_CROATIAN=m | ||
437 | CONFIG_NLS_MAC_CYRILLIC=m | ||
438 | CONFIG_NLS_MAC_GAELIC=m | ||
439 | CONFIG_NLS_MAC_GREEK=m | ||
440 | CONFIG_NLS_MAC_ICELAND=m | ||
441 | CONFIG_NLS_MAC_INUIT=m | ||
442 | CONFIG_NLS_MAC_ROMANIAN=m | ||
443 | CONFIG_NLS_MAC_TURKISH=m | ||
335 | CONFIG_DLM=m | 444 | CONFIG_DLM=m |
336 | CONFIG_MAGIC_SYSRQ=y | 445 | CONFIG_MAGIC_SYSRQ=y |
337 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 446 | CONFIG_ASYNC_RAID6_TEST=m |
338 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 447 | CONFIG_ENCRYPTED_KEYS=m |
448 | CONFIG_CRYPTO_MANAGER=y | ||
449 | CONFIG_CRYPTO_USER=m | ||
339 | CONFIG_CRYPTO_NULL=m | 450 | CONFIG_CRYPTO_NULL=m |
340 | CONFIG_CRYPTO_CRYPTD=m | 451 | CONFIG_CRYPTO_CRYPTD=m |
341 | CONFIG_CRYPTO_TEST=m | 452 | CONFIG_CRYPTO_TEST=m |
@@ -345,19 +456,16 @@ CONFIG_CRYPTO_CTS=m | |||
345 | CONFIG_CRYPTO_LRW=m | 456 | CONFIG_CRYPTO_LRW=m |
346 | CONFIG_CRYPTO_PCBC=m | 457 | CONFIG_CRYPTO_PCBC=m |
347 | CONFIG_CRYPTO_XTS=m | 458 | CONFIG_CRYPTO_XTS=m |
348 | CONFIG_CRYPTO_HMAC=y | ||
349 | CONFIG_CRYPTO_XCBC=m | 459 | CONFIG_CRYPTO_XCBC=m |
350 | CONFIG_CRYPTO_MD4=m | 460 | CONFIG_CRYPTO_VMAC=m |
351 | CONFIG_CRYPTO_MICHAEL_MIC=m | 461 | CONFIG_CRYPTO_MICHAEL_MIC=m |
352 | CONFIG_CRYPTO_RMD128=m | 462 | CONFIG_CRYPTO_RMD128=m |
353 | CONFIG_CRYPTO_RMD160=m | 463 | CONFIG_CRYPTO_RMD160=m |
354 | CONFIG_CRYPTO_RMD256=m | 464 | CONFIG_CRYPTO_RMD256=m |
355 | CONFIG_CRYPTO_RMD320=m | 465 | CONFIG_CRYPTO_RMD320=m |
356 | CONFIG_CRYPTO_SHA256=m | ||
357 | CONFIG_CRYPTO_SHA512=m | 466 | CONFIG_CRYPTO_SHA512=m |
358 | CONFIG_CRYPTO_TGR192=m | 467 | CONFIG_CRYPTO_TGR192=m |
359 | CONFIG_CRYPTO_WP512=m | 468 | CONFIG_CRYPTO_WP512=m |
360 | CONFIG_CRYPTO_AES=m | ||
361 | CONFIG_CRYPTO_ANUBIS=m | 469 | CONFIG_CRYPTO_ANUBIS=m |
362 | CONFIG_CRYPTO_BLOWFISH=m | 470 | CONFIG_CRYPTO_BLOWFISH=m |
363 | CONFIG_CRYPTO_CAMELLIA=m | 471 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -373,6 +481,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
373 | CONFIG_CRYPTO_ZLIB=m | 481 | CONFIG_CRYPTO_ZLIB=m |
374 | CONFIG_CRYPTO_LZO=m | 482 | CONFIG_CRYPTO_LZO=m |
375 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 483 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
484 | CONFIG_CRYPTO_USER_API_HASH=m | ||
485 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
376 | # CONFIG_CRYPTO_HW is not set | 486 | # CONFIG_CRYPTO_HW is not set |
377 | CONFIG_CRC16=m | ||
378 | CONFIG_CRC_T10DIF=y | 487 | CONFIG_CRC_T10DIF=y |
488 | CONFIG_XZ_DEC_X86=y | ||
489 | CONFIG_XZ_DEC_POWERPC=y | ||
490 | CONFIG_XZ_DEC_IA64=y | ||
491 | CONFIG_XZ_DEC_ARM=y | ||
492 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
493 | CONFIG_XZ_DEC_SPARC=y | ||
494 | CONFIG_XZ_DEC_TEST=m | ||