diff options
author | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /arch/m68k/configs/atari_defconfig | |
parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/m68k/configs/atari_defconfig')
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 130 |
1 files changed, 73 insertions, 57 deletions
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 654c5acb9e86..a594a1d47b62 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc6 | 3 | # Linux kernel version: 2.6.28-rc7 |
4 | # Wed Sep 10 09:02:02 2008 | 4 | # Tue Dec 2 20:27:44 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -14,7 +14,6 @@ CONFIG_TIME_LOW_RES=y | |||
14 | CONFIG_GENERIC_IOMAP=y | 14 | CONFIG_GENERIC_IOMAP=y |
15 | CONFIG_NO_IOPORT=y | 15 | CONFIG_NO_IOPORT=y |
16 | # CONFIG_NO_DMA is not set | 16 | # CONFIG_NO_DMA is not set |
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | 19 | ||
@@ -67,22 +66,13 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 66 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 67 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 68 | CONFIG_SHMEM=y |
69 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLAB=y | 71 | CONFIG_SLAB=y |
72 | # CONFIG_SLUB is not set | 72 | # CONFIG_SLUB is not set |
73 | # CONFIG_SLOB is not set | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
75 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
79 | # CONFIG_HAVE_KPROBES is not set | ||
80 | # CONFIG_HAVE_KRETPROBES is not set | ||
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
85 | CONFIG_PROC_PAGE_MONITOR=y | ||
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
87 | CONFIG_SLABINFO=y | 77 | CONFIG_SLABINFO=y |
88 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
@@ -115,11 +105,11 @@ CONFIG_DEFAULT_AS=y | |||
115 | # CONFIG_DEFAULT_NOOP is not set | 105 | # CONFIG_DEFAULT_NOOP is not set |
116 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
117 | CONFIG_CLASSIC_RCU=y | 107 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_FREEZER is not set | ||
118 | 109 | ||
119 | # | 110 | # |
120 | # Platform dependent setup | 111 | # Platform dependent setup |
121 | # | 112 | # |
122 | # CONFIG_SUN3 is not set | ||
123 | # CONFIG_AMIGA is not set | 113 | # CONFIG_AMIGA is not set |
124 | CONFIG_ATARI=y | 114 | CONFIG_ATARI=y |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -148,19 +138,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
148 | CONFIG_DISCONTIGMEM=y | 138 | CONFIG_DISCONTIGMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 139 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | CONFIG_NEED_MULTIPLE_NODES=y | 140 | CONFIG_NEED_MULTIPLE_NODES=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | ||
152 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
153 | CONFIG_PAGEFLAGS_EXTENDED=y | 141 | CONFIG_PAGEFLAGS_EXTENDED=y |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_RESOURCES_64BIT is not set | 143 | # CONFIG_RESOURCES_64BIT is not set |
144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
156 | CONFIG_ZONE_DMA_FLAG=1 | 145 | CONFIG_ZONE_DMA_FLAG=1 |
157 | CONFIG_BOUNCE=y | 146 | CONFIG_BOUNCE=y |
158 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
148 | CONFIG_UNEVICTABLE_LRU=y | ||
159 | 149 | ||
160 | # | 150 | # |
161 | # General setup | 151 | # General setup |
162 | # | 152 | # |
163 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
154 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
155 | CONFIG_HAVE_AOUT=y | ||
164 | CONFIG_BINFMT_AOUT=m | 156 | CONFIG_BINFMT_AOUT=m |
165 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
166 | CONFIG_STRAM_PROC=y | 158 | CONFIG_STRAM_PROC=y |
@@ -208,7 +200,6 @@ CONFIG_INET_TCP_DIAG=m | |||
208 | CONFIG_TCP_CONG_CUBIC=y | 200 | CONFIG_TCP_CONG_CUBIC=y |
209 | CONFIG_DEFAULT_TCP_CONG="cubic" | 201 | CONFIG_DEFAULT_TCP_CONG="cubic" |
210 | # CONFIG_TCP_MD5SIG is not set | 202 | # CONFIG_TCP_MD5SIG is not set |
211 | # CONFIG_IP_VS is not set | ||
212 | CONFIG_IPV6=m | 203 | CONFIG_IPV6=m |
213 | CONFIG_IPV6_PRIVACY=y | 204 | CONFIG_IPV6_PRIVACY=y |
214 | CONFIG_IPV6_ROUTER_PREF=y | 205 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -258,13 +249,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
258 | CONFIG_NF_CONNTRACK_SIP=m | 249 | CONFIG_NF_CONNTRACK_SIP=m |
259 | CONFIG_NF_CONNTRACK_TFTP=m | 250 | CONFIG_NF_CONNTRACK_TFTP=m |
260 | # CONFIG_NF_CT_NETLINK is not set | 251 | # CONFIG_NF_CT_NETLINK is not set |
252 | # CONFIG_NETFILTER_TPROXY is not set | ||
261 | CONFIG_NETFILTER_XTABLES=m | 253 | CONFIG_NETFILTER_XTABLES=m |
262 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 254 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
263 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 255 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
264 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 256 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
265 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 257 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
266 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
267 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 258 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
259 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
268 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 260 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
269 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 261 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
270 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 262 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -278,19 +270,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
278 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 270 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
279 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 271 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
280 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 272 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
273 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 274 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
282 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 275 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
283 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 276 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
284 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 277 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
285 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 278 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
286 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 279 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
280 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
288 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
289 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 283 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
291 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 284 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
292 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 285 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
293 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 286 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
287 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
288 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
294 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 289 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
295 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 290 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
296 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 291 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -298,20 +293,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
298 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 293 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
299 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 294 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
300 | CONFIG_NETFILTER_XT_MATCH_U32=m | 295 | CONFIG_NETFILTER_XT_MATCH_U32=m |
301 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 296 | # CONFIG_IP_VS is not set |
302 | 297 | ||
303 | # | 298 | # |
304 | # IP: Netfilter Configuration | 299 | # IP: Netfilter Configuration |
305 | # | 300 | # |
301 | CONFIG_NF_DEFRAG_IPV4=m | ||
306 | CONFIG_NF_CONNTRACK_IPV4=m | 302 | CONFIG_NF_CONNTRACK_IPV4=m |
307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 303 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
308 | CONFIG_IP_NF_QUEUE=m | 304 | CONFIG_IP_NF_QUEUE=m |
309 | CONFIG_IP_NF_IPTABLES=m | 305 | CONFIG_IP_NF_IPTABLES=m |
310 | CONFIG_IP_NF_MATCH_RECENT=m | 306 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
311 | CONFIG_IP_NF_MATCH_ECN=m | ||
312 | CONFIG_IP_NF_MATCH_AH=m | 307 | CONFIG_IP_NF_MATCH_AH=m |
308 | CONFIG_IP_NF_MATCH_ECN=m | ||
313 | CONFIG_IP_NF_MATCH_TTL=m | 309 | CONFIG_IP_NF_MATCH_TTL=m |
314 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
315 | CONFIG_IP_NF_FILTER=m | 310 | CONFIG_IP_NF_FILTER=m |
316 | CONFIG_IP_NF_TARGET_REJECT=m | 311 | CONFIG_IP_NF_TARGET_REJECT=m |
317 | CONFIG_IP_NF_TARGET_LOG=m | 312 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -319,8 +314,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
319 | CONFIG_NF_NAT=m | 314 | CONFIG_NF_NAT=m |
320 | CONFIG_NF_NAT_NEEDED=y | 315 | CONFIG_NF_NAT_NEEDED=y |
321 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 316 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
323 | CONFIG_IP_NF_TARGET_NETMAP=m | 317 | CONFIG_IP_NF_TARGET_NETMAP=m |
318 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
324 | CONFIG_NF_NAT_SNMP_BASIC=m | 319 | CONFIG_NF_NAT_SNMP_BASIC=m |
325 | CONFIG_NF_NAT_PROTO_GRE=m | 320 | CONFIG_NF_NAT_PROTO_GRE=m |
326 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 321 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -333,9 +328,9 @@ CONFIG_NF_NAT_PPTP=m | |||
333 | CONFIG_NF_NAT_H323=m | 328 | CONFIG_NF_NAT_H323=m |
334 | CONFIG_NF_NAT_SIP=m | 329 | CONFIG_NF_NAT_SIP=m |
335 | CONFIG_IP_NF_MANGLE=m | 330 | CONFIG_IP_NF_MANGLE=m |
331 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
336 | CONFIG_IP_NF_TARGET_ECN=m | 332 | CONFIG_IP_NF_TARGET_ECN=m |
337 | CONFIG_IP_NF_TARGET_TTL=m | 333 | CONFIG_IP_NF_TARGET_TTL=m |
338 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
339 | CONFIG_IP_NF_RAW=m | 334 | CONFIG_IP_NF_RAW=m |
340 | CONFIG_IP_NF_ARPTABLES=m | 335 | CONFIG_IP_NF_ARPTABLES=m |
341 | CONFIG_IP_NF_ARPFILTER=m | 336 | CONFIG_IP_NF_ARPFILTER=m |
@@ -347,16 +342,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
347 | CONFIG_NF_CONNTRACK_IPV6=m | 342 | CONFIG_NF_CONNTRACK_IPV6=m |
348 | CONFIG_IP6_NF_QUEUE=m | 343 | CONFIG_IP6_NF_QUEUE=m |
349 | CONFIG_IP6_NF_IPTABLES=m | 344 | CONFIG_IP6_NF_IPTABLES=m |
350 | CONFIG_IP6_NF_MATCH_RT=m | 345 | CONFIG_IP6_NF_MATCH_AH=m |
351 | CONFIG_IP6_NF_MATCH_OPTS=m | 346 | CONFIG_IP6_NF_MATCH_EUI64=m |
352 | CONFIG_IP6_NF_MATCH_FRAG=m | 347 | CONFIG_IP6_NF_MATCH_FRAG=m |
348 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
353 | CONFIG_IP6_NF_MATCH_HL=m | 349 | CONFIG_IP6_NF_MATCH_HL=m |
354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 350 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
355 | CONFIG_IP6_NF_MATCH_AH=m | ||
356 | CONFIG_IP6_NF_MATCH_MH=m | 351 | CONFIG_IP6_NF_MATCH_MH=m |
357 | CONFIG_IP6_NF_MATCH_EUI64=m | 352 | CONFIG_IP6_NF_MATCH_RT=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
359 | CONFIG_IP6_NF_TARGET_LOG=m | 353 | CONFIG_IP6_NF_TARGET_LOG=m |
354 | CONFIG_IP6_NF_FILTER=m | ||
360 | CONFIG_IP6_NF_TARGET_REJECT=m | 355 | CONFIG_IP6_NF_TARGET_REJECT=m |
361 | CONFIG_IP6_NF_MANGLE=m | 356 | CONFIG_IP6_NF_MANGLE=m |
362 | CONFIG_IP6_NF_TARGET_HL=m | 357 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -383,6 +378,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
383 | # CONFIG_TIPC is not set | 378 | # CONFIG_TIPC is not set |
384 | # CONFIG_ATM is not set | 379 | # CONFIG_ATM is not set |
385 | # CONFIG_BRIDGE is not set | 380 | # CONFIG_BRIDGE is not set |
381 | # CONFIG_NET_DSA is not set | ||
386 | # CONFIG_VLAN_8021Q is not set | 382 | # CONFIG_VLAN_8021Q is not set |
387 | # CONFIG_DECNET is not set | 383 | # CONFIG_DECNET is not set |
388 | CONFIG_LLC=m | 384 | CONFIG_LLC=m |
@@ -406,19 +402,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
406 | # CONFIG_IRDA is not set | 402 | # CONFIG_IRDA is not set |
407 | # CONFIG_BT is not set | 403 | # CONFIG_BT is not set |
408 | # CONFIG_AF_RXRPC is not set | 404 | # CONFIG_AF_RXRPC is not set |
409 | 405 | # CONFIG_PHONET is not set | |
410 | # | 406 | # CONFIG_WIRELESS is not set |
411 | # Wireless | ||
412 | # | ||
413 | # CONFIG_CFG80211 is not set | ||
414 | CONFIG_WIRELESS_EXT=y | ||
415 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
416 | # CONFIG_MAC80211 is not set | ||
417 | CONFIG_IEEE80211=m | ||
418 | # CONFIG_IEEE80211_DEBUG is not set | ||
419 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
420 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
421 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
422 | # CONFIG_RFKILL is not set | 407 | # CONFIG_RFKILL is not set |
423 | # CONFIG_NET_9P is not set | 408 | # CONFIG_NET_9P is not set |
424 | 409 | ||
@@ -462,21 +447,20 @@ CONFIG_ATA_OVER_ETH=m | |||
462 | CONFIG_MISC_DEVICES=y | 447 | CONFIG_MISC_DEVICES=y |
463 | # CONFIG_EEPROM_93CX6 is not set | 448 | # CONFIG_EEPROM_93CX6 is not set |
464 | # CONFIG_ENCLOSURE_SERVICES is not set | 449 | # CONFIG_ENCLOSURE_SERVICES is not set |
450 | # CONFIG_C2PORT is not set | ||
465 | CONFIG_HAVE_IDE=y | 451 | CONFIG_HAVE_IDE=y |
466 | CONFIG_IDE=y | 452 | CONFIG_IDE=y |
467 | CONFIG_BLK_DEV_IDE=y | ||
468 | 453 | ||
469 | # | 454 | # |
470 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 455 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
471 | # | 456 | # |
472 | CONFIG_IDE_ATAPI=y | ||
473 | # CONFIG_BLK_DEV_IDE_SATA is not set | 457 | # CONFIG_BLK_DEV_IDE_SATA is not set |
474 | CONFIG_BLK_DEV_IDEDISK=y | 458 | CONFIG_IDE_GD=y |
475 | # CONFIG_IDEDISK_MULTI_MODE is not set | 459 | CONFIG_IDE_GD_ATA=y |
460 | # CONFIG_IDE_GD_ATAPI is not set | ||
476 | CONFIG_BLK_DEV_IDECD=y | 461 | CONFIG_BLK_DEV_IDECD=y |
477 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 462 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
478 | # CONFIG_BLK_DEV_IDETAPE is not set | 463 | # CONFIG_BLK_DEV_IDETAPE is not set |
479 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
480 | # CONFIG_BLK_DEV_IDESCSI is not set | 464 | # CONFIG_BLK_DEV_IDESCSI is not set |
481 | # CONFIG_IDE_TASK_IOCTL is not set | 465 | # CONFIG_IDE_TASK_IOCTL is not set |
482 | CONFIG_IDE_PROC_FS=y | 466 | CONFIG_IDE_PROC_FS=y |
@@ -565,12 +549,15 @@ CONFIG_EQUALIZER=m | |||
565 | CONFIG_VETH=m | 549 | CONFIG_VETH=m |
566 | # CONFIG_PHYLIB is not set | 550 | # CONFIG_PHYLIB is not set |
567 | CONFIG_NET_ETHERNET=y | 551 | CONFIG_NET_ETHERNET=y |
568 | CONFIG_MII=m | 552 | CONFIG_MII=y |
569 | CONFIG_ATARILANCE=m | 553 | CONFIG_ATARILANCE=m |
570 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 554 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
571 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 555 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
572 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 556 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
573 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 557 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
558 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
559 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
560 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
574 | # CONFIG_B44 is not set | 561 | # CONFIG_B44 is not set |
575 | # CONFIG_NET_POCKET is not set | 562 | # CONFIG_NET_POCKET is not set |
576 | # CONFIG_NETDEV_1000 is not set | 563 | # CONFIG_NETDEV_1000 is not set |
@@ -644,6 +631,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
644 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 631 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
645 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 632 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
646 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 633 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
634 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
647 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 635 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
648 | # CONFIG_MOUSE_SERIAL is not set | 636 | # CONFIG_MOUSE_SERIAL is not set |
649 | CONFIG_MOUSE_ATARI=m | 637 | CONFIG_MOUSE_ATARI=m |
@@ -706,11 +694,11 @@ CONFIG_GEN_RTC_X=y | |||
706 | # CONFIG_THERMAL is not set | 694 | # CONFIG_THERMAL is not set |
707 | # CONFIG_THERMAL_HWMON is not set | 695 | # CONFIG_THERMAL_HWMON is not set |
708 | # CONFIG_WATCHDOG is not set | 696 | # CONFIG_WATCHDOG is not set |
697 | CONFIG_SSB_POSSIBLE=y | ||
709 | 698 | ||
710 | # | 699 | # |
711 | # Sonics Silicon Backplane | 700 | # Sonics Silicon Backplane |
712 | # | 701 | # |
713 | CONFIG_SSB_POSSIBLE=y | ||
714 | # CONFIG_SSB is not set | 702 | # CONFIG_SSB is not set |
715 | 703 | ||
716 | # | 704 | # |
@@ -720,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
720 | # CONFIG_MFD_SM501 is not set | 708 | # CONFIG_MFD_SM501 is not set |
721 | # CONFIG_HTC_PASIC3 is not set | 709 | # CONFIG_HTC_PASIC3 is not set |
722 | # CONFIG_MFD_TMIO is not set | 710 | # CONFIG_MFD_TMIO is not set |
711 | # CONFIG_REGULATOR is not set | ||
723 | 712 | ||
724 | # | 713 | # |
725 | # Multimedia devices | 714 | # Multimedia devices |
@@ -745,6 +734,7 @@ CONFIG_SSB_POSSIBLE=y | |||
745 | CONFIG_FB=y | 734 | CONFIG_FB=y |
746 | # CONFIG_FIRMWARE_EDID is not set | 735 | # CONFIG_FIRMWARE_EDID is not set |
747 | # CONFIG_FB_DDC is not set | 736 | # CONFIG_FB_DDC is not set |
737 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
748 | CONFIG_FB_CFB_FILLRECT=y | 738 | CONFIG_FB_CFB_FILLRECT=y |
749 | CONFIG_FB_CFB_COPYAREA=y | 739 | CONFIG_FB_CFB_COPYAREA=y |
750 | CONFIG_FB_CFB_IMAGEBLIT=y | 740 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -768,6 +758,8 @@ CONFIG_FB_ATARI=y | |||
768 | # CONFIG_FB_S1D13XXX is not set | 758 | # CONFIG_FB_S1D13XXX is not set |
769 | # CONFIG_FB_ATY is not set | 759 | # CONFIG_FB_ATY is not set |
770 | # CONFIG_FB_VIRTUAL is not set | 760 | # CONFIG_FB_VIRTUAL is not set |
761 | # CONFIG_FB_METRONOME is not set | ||
762 | # CONFIG_FB_MB862XX is not set | ||
771 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
772 | 764 | ||
773 | # | 765 | # |
@@ -790,12 +782,19 @@ CONFIG_LOGO_LINUX_MONO=y | |||
790 | CONFIG_LOGO_LINUX_VGA16=y | 782 | CONFIG_LOGO_LINUX_VGA16=y |
791 | CONFIG_LOGO_LINUX_CLUT224=y | 783 | CONFIG_LOGO_LINUX_CLUT224=y |
792 | CONFIG_SOUND=m | 784 | CONFIG_SOUND=m |
785 | CONFIG_SOUND_OSS_CORE=y | ||
793 | CONFIG_DMASOUND_ATARI=m | 786 | CONFIG_DMASOUND_ATARI=m |
794 | CONFIG_DMASOUND=m | 787 | CONFIG_DMASOUND=m |
795 | CONFIG_HID_SUPPORT=y | 788 | CONFIG_HID_SUPPORT=y |
796 | CONFIG_HID=m | 789 | CONFIG_HID=m |
797 | # CONFIG_HID_DEBUG is not set | 790 | # CONFIG_HID_DEBUG is not set |
798 | CONFIG_HIDRAW=y | 791 | CONFIG_HIDRAW=y |
792 | # CONFIG_HID_PID is not set | ||
793 | |||
794 | # | ||
795 | # Special HID drivers | ||
796 | # | ||
797 | CONFIG_HID_COMPAT=y | ||
799 | # CONFIG_USB_SUPPORT is not set | 798 | # CONFIG_USB_SUPPORT is not set |
800 | # CONFIG_MMC is not set | 799 | # CONFIG_MMC is not set |
801 | # CONFIG_MEMSTICK is not set | 800 | # CONFIG_MEMSTICK is not set |
@@ -805,6 +804,8 @@ CONFIG_HIDRAW=y | |||
805 | # CONFIG_DMADEVICES is not set | 804 | # CONFIG_DMADEVICES is not set |
806 | # CONFIG_AUXDISPLAY is not set | 805 | # CONFIG_AUXDISPLAY is not set |
807 | # CONFIG_UIO is not set | 806 | # CONFIG_UIO is not set |
807 | # CONFIG_STAGING is not set | ||
808 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
808 | 809 | ||
809 | # | 810 | # |
810 | # Character devices | 811 | # Character devices |
@@ -821,10 +822,9 @@ CONFIG_EXT2_FS=y | |||
821 | # CONFIG_EXT2_FS_XIP is not set | 822 | # CONFIG_EXT2_FS_XIP is not set |
822 | CONFIG_EXT3_FS=y | 823 | CONFIG_EXT3_FS=y |
823 | # CONFIG_EXT3_FS_XATTR is not set | 824 | # CONFIG_EXT3_FS_XATTR is not set |
824 | CONFIG_EXT4DEV_FS=y | 825 | # CONFIG_EXT4_FS is not set |
825 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
826 | CONFIG_JBD=y | 826 | CONFIG_JBD=y |
827 | CONFIG_JBD2=y | 827 | CONFIG_JBD2=m |
828 | CONFIG_REISERFS_FS=m | 828 | CONFIG_REISERFS_FS=m |
829 | # CONFIG_REISERFS_CHECK is not set | 829 | # CONFIG_REISERFS_CHECK is not set |
830 | # CONFIG_REISERFS_PROC_INFO is not set | 830 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -835,6 +835,7 @@ CONFIG_JFS_FS=m | |||
835 | # CONFIG_JFS_DEBUG is not set | 835 | # CONFIG_JFS_DEBUG is not set |
836 | # CONFIG_JFS_STATISTICS is not set | 836 | # CONFIG_JFS_STATISTICS is not set |
837 | # CONFIG_FS_POSIX_ACL is not set | 837 | # CONFIG_FS_POSIX_ACL is not set |
838 | CONFIG_FILE_LOCKING=y | ||
838 | CONFIG_XFS_FS=m | 839 | CONFIG_XFS_FS=m |
839 | # CONFIG_XFS_QUOTA is not set | 840 | # CONFIG_XFS_QUOTA is not set |
840 | # CONFIG_XFS_POSIX_ACL is not set | 841 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -846,6 +847,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
846 | # CONFIG_OCFS2_FS_STATS is not set | 847 | # CONFIG_OCFS2_FS_STATS is not set |
847 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 848 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
848 | # CONFIG_OCFS2_DEBUG_FS is not set | 849 | # CONFIG_OCFS2_DEBUG_FS is not set |
850 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
849 | CONFIG_DNOTIFY=y | 851 | CONFIG_DNOTIFY=y |
850 | CONFIG_INOTIFY=y | 852 | CONFIG_INOTIFY=y |
851 | CONFIG_INOTIFY_USER=y | 853 | CONFIG_INOTIFY_USER=y |
@@ -884,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
884 | CONFIG_PROC_FS=y | 886 | CONFIG_PROC_FS=y |
885 | CONFIG_PROC_KCORE=y | 887 | CONFIG_PROC_KCORE=y |
886 | CONFIG_PROC_SYSCTL=y | 888 | CONFIG_PROC_SYSCTL=y |
889 | CONFIG_PROC_PAGE_MONITOR=y | ||
887 | CONFIG_SYSFS=y | 890 | CONFIG_SYSFS=y |
888 | CONFIG_TMPFS=y | 891 | CONFIG_TMPFS=y |
889 | # CONFIG_TMPFS_POSIX_ACL is not set | 892 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -925,6 +928,7 @@ CONFIG_LOCKD_V4=y | |||
925 | CONFIG_EXPORTFS=m | 928 | CONFIG_EXPORTFS=m |
926 | CONFIG_NFS_COMMON=y | 929 | CONFIG_NFS_COMMON=y |
927 | CONFIG_SUNRPC=m | 930 | CONFIG_SUNRPC=m |
931 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
928 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 932 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
929 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 933 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
930 | CONFIG_SMB_FS=m | 934 | CONFIG_SMB_FS=m |
@@ -998,7 +1002,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
998 | # CONFIG_DEBUG_KERNEL is not set | 1002 | # CONFIG_DEBUG_KERNEL is not set |
999 | CONFIG_DEBUG_BUGVERBOSE=y | 1003 | CONFIG_DEBUG_BUGVERBOSE=y |
1000 | CONFIG_DEBUG_MEMORY_INIT=y | 1004 | CONFIG_DEBUG_MEMORY_INIT=y |
1005 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1001 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1006 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1007 | |||
1008 | # | ||
1009 | # Tracers | ||
1010 | # | ||
1011 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1002 | # CONFIG_SAMPLES is not set | 1012 | # CONFIG_SAMPLES is not set |
1003 | 1013 | ||
1004 | # | 1014 | # |
@@ -1006,6 +1016,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1006 | # | 1016 | # |
1007 | # CONFIG_KEYS is not set | 1017 | # CONFIG_KEYS is not set |
1008 | # CONFIG_SECURITY is not set | 1018 | # CONFIG_SECURITY is not set |
1019 | # CONFIG_SECURITYFS is not set | ||
1009 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1020 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1010 | CONFIG_XOR_BLOCKS=m | 1021 | CONFIG_XOR_BLOCKS=m |
1011 | CONFIG_ASYNC_CORE=m | 1022 | CONFIG_ASYNC_CORE=m |
@@ -1016,10 +1027,12 @@ CONFIG_CRYPTO=y | |||
1016 | # | 1027 | # |
1017 | # Crypto core or helper | 1028 | # Crypto core or helper |
1018 | # | 1029 | # |
1030 | # CONFIG_CRYPTO_FIPS is not set | ||
1019 | CONFIG_CRYPTO_ALGAPI=y | 1031 | CONFIG_CRYPTO_ALGAPI=y |
1020 | CONFIG_CRYPTO_AEAD=m | 1032 | CONFIG_CRYPTO_AEAD=y |
1021 | CONFIG_CRYPTO_BLKCIPHER=m | 1033 | CONFIG_CRYPTO_BLKCIPHER=y |
1022 | CONFIG_CRYPTO_HASH=y | 1034 | CONFIG_CRYPTO_HASH=y |
1035 | CONFIG_CRYPTO_RNG=y | ||
1023 | CONFIG_CRYPTO_MANAGER=y | 1036 | CONFIG_CRYPTO_MANAGER=y |
1024 | CONFIG_CRYPTO_GF128MUL=m | 1037 | CONFIG_CRYPTO_GF128MUL=m |
1025 | CONFIG_CRYPTO_NULL=m | 1038 | CONFIG_CRYPTO_NULL=m |
@@ -1093,14 +1106,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1093 | # | 1106 | # |
1094 | CONFIG_CRYPTO_DEFLATE=m | 1107 | CONFIG_CRYPTO_DEFLATE=m |
1095 | CONFIG_CRYPTO_LZO=m | 1108 | CONFIG_CRYPTO_LZO=m |
1109 | |||
1110 | # | ||
1111 | # Random Number Generation | ||
1112 | # | ||
1113 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1096 | # CONFIG_CRYPTO_HW is not set | 1114 | # CONFIG_CRYPTO_HW is not set |
1097 | 1115 | ||
1098 | # | 1116 | # |
1099 | # Library routines | 1117 | # Library routines |
1100 | # | 1118 | # |
1101 | CONFIG_BITREVERSE=y | 1119 | CONFIG_BITREVERSE=y |
1102 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1103 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1104 | CONFIG_CRC_CCITT=m | 1120 | CONFIG_CRC_CCITT=m |
1105 | CONFIG_CRC16=y | 1121 | CONFIG_CRC16=y |
1106 | CONFIG_CRC_T10DIF=y | 1122 | CONFIG_CRC_T10DIF=y |