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/mvme147_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/mvme147_defconfig')
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 112 |
1 files changed, 64 insertions, 48 deletions
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index cacb5aef6a37..52d42715bd0b 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_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:08 2008 | 4 | # Tue Dec 2 20:27:50 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 is not set | 114 | # CONFIG_ATARI is not set |
125 | # CONFIG_MAC is not set | 115 | # CONFIG_MAC is not set |
@@ -151,19 +141,21 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
151 | CONFIG_DISCONTIGMEM=y | 141 | CONFIG_DISCONTIGMEM=y |
152 | CONFIG_FLAT_NODE_MEM_MAP=y | 142 | CONFIG_FLAT_NODE_MEM_MAP=y |
153 | CONFIG_NEED_MULTIPLE_NODES=y | 143 | CONFIG_NEED_MULTIPLE_NODES=y |
154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
156 | CONFIG_PAGEFLAGS_EXTENDED=y | 144 | CONFIG_PAGEFLAGS_EXTENDED=y |
157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
158 | # CONFIG_RESOURCES_64BIT is not set | 146 | # CONFIG_RESOURCES_64BIT is not set |
147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
159 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
160 | CONFIG_BOUNCE=y | 149 | CONFIG_BOUNCE=y |
161 | CONFIG_VIRT_TO_BUS=y | 150 | CONFIG_VIRT_TO_BUS=y |
151 | CONFIG_UNEVICTABLE_LRU=y | ||
162 | 152 | ||
163 | # | 153 | # |
164 | # General setup | 154 | # General setup |
165 | # | 155 | # |
166 | CONFIG_BINFMT_ELF=y | 156 | CONFIG_BINFMT_ELF=y |
157 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
158 | CONFIG_HAVE_AOUT=y | ||
167 | CONFIG_BINFMT_AOUT=m | 159 | CONFIG_BINFMT_AOUT=m |
168 | CONFIG_BINFMT_MISC=m | 160 | CONFIG_BINFMT_MISC=m |
169 | CONFIG_PROC_HARDWARE=y | 161 | CONFIG_PROC_HARDWARE=y |
@@ -212,7 +204,6 @@ CONFIG_INET_TCP_DIAG=m | |||
212 | CONFIG_TCP_CONG_CUBIC=y | 204 | CONFIG_TCP_CONG_CUBIC=y |
213 | CONFIG_DEFAULT_TCP_CONG="cubic" | 205 | CONFIG_DEFAULT_TCP_CONG="cubic" |
214 | # CONFIG_TCP_MD5SIG is not set | 206 | # CONFIG_TCP_MD5SIG is not set |
215 | # CONFIG_IP_VS is not set | ||
216 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
217 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
218 | CONFIG_IPV6_ROUTER_PREF=y | 209 | CONFIG_IPV6_ROUTER_PREF=y |
@@ -262,13 +253,14 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
262 | CONFIG_NF_CONNTRACK_SIP=m | 253 | CONFIG_NF_CONNTRACK_SIP=m |
263 | CONFIG_NF_CONNTRACK_TFTP=m | 254 | CONFIG_NF_CONNTRACK_TFTP=m |
264 | # CONFIG_NF_CT_NETLINK is not set | 255 | # CONFIG_NF_CT_NETLINK is not set |
256 | # CONFIG_NETFILTER_TPROXY is not set | ||
265 | CONFIG_NETFILTER_XTABLES=m | 257 | CONFIG_NETFILTER_XTABLES=m |
266 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
267 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
268 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
269 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
270 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
271 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
272 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 264 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
273 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | 265 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m |
274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
@@ -282,19 +274,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | |||
282 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 274 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
283 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 275 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
284 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
286 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
287 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
288 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
289 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 282 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
290 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 283 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
284 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 285 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
292 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 286 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
293 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 287 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
295 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 288 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
296 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 289 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
297 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 290 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
291 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
292 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 293 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
299 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 294 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
300 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 295 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
@@ -302,20 +297,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
302 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 297 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
303 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 298 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
304 | CONFIG_NETFILTER_XT_MATCH_U32=m | 299 | CONFIG_NETFILTER_XT_MATCH_U32=m |
305 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 300 | # CONFIG_IP_VS is not set |
306 | 301 | ||
307 | # | 302 | # |
308 | # IP: Netfilter Configuration | 303 | # IP: Netfilter Configuration |
309 | # | 304 | # |
305 | CONFIG_NF_DEFRAG_IPV4=m | ||
310 | CONFIG_NF_CONNTRACK_IPV4=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
312 | CONFIG_IP_NF_QUEUE=m | 308 | CONFIG_IP_NF_QUEUE=m |
313 | CONFIG_IP_NF_IPTABLES=m | 309 | CONFIG_IP_NF_IPTABLES=m |
314 | CONFIG_IP_NF_MATCH_RECENT=m | 310 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
315 | CONFIG_IP_NF_MATCH_ECN=m | ||
316 | CONFIG_IP_NF_MATCH_AH=m | 311 | CONFIG_IP_NF_MATCH_AH=m |
312 | CONFIG_IP_NF_MATCH_ECN=m | ||
317 | CONFIG_IP_NF_MATCH_TTL=m | 313 | CONFIG_IP_NF_MATCH_TTL=m |
318 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
319 | CONFIG_IP_NF_FILTER=m | 314 | CONFIG_IP_NF_FILTER=m |
320 | CONFIG_IP_NF_TARGET_REJECT=m | 315 | CONFIG_IP_NF_TARGET_REJECT=m |
321 | CONFIG_IP_NF_TARGET_LOG=m | 316 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -323,8 +318,8 @@ CONFIG_IP_NF_TARGET_ULOG=m | |||
323 | CONFIG_NF_NAT=m | 318 | CONFIG_NF_NAT=m |
324 | CONFIG_NF_NAT_NEEDED=y | 319 | CONFIG_NF_NAT_NEEDED=y |
325 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 320 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
326 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
327 | CONFIG_IP_NF_TARGET_NETMAP=m | 321 | CONFIG_IP_NF_TARGET_NETMAP=m |
322 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
328 | CONFIG_NF_NAT_SNMP_BASIC=m | 323 | CONFIG_NF_NAT_SNMP_BASIC=m |
329 | CONFIG_NF_NAT_PROTO_GRE=m | 324 | CONFIG_NF_NAT_PROTO_GRE=m |
330 | CONFIG_NF_NAT_PROTO_UDPLITE=m | 325 | CONFIG_NF_NAT_PROTO_UDPLITE=m |
@@ -337,9 +332,9 @@ CONFIG_NF_NAT_PPTP=m | |||
337 | CONFIG_NF_NAT_H323=m | 332 | CONFIG_NF_NAT_H323=m |
338 | CONFIG_NF_NAT_SIP=m | 333 | CONFIG_NF_NAT_SIP=m |
339 | CONFIG_IP_NF_MANGLE=m | 334 | CONFIG_IP_NF_MANGLE=m |
335 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
340 | CONFIG_IP_NF_TARGET_ECN=m | 336 | CONFIG_IP_NF_TARGET_ECN=m |
341 | CONFIG_IP_NF_TARGET_TTL=m | 337 | CONFIG_IP_NF_TARGET_TTL=m |
342 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
343 | CONFIG_IP_NF_RAW=m | 338 | CONFIG_IP_NF_RAW=m |
344 | CONFIG_IP_NF_ARPTABLES=m | 339 | CONFIG_IP_NF_ARPTABLES=m |
345 | CONFIG_IP_NF_ARPFILTER=m | 340 | CONFIG_IP_NF_ARPFILTER=m |
@@ -351,16 +346,16 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
351 | CONFIG_NF_CONNTRACK_IPV6=m | 346 | CONFIG_NF_CONNTRACK_IPV6=m |
352 | CONFIG_IP6_NF_QUEUE=m | 347 | CONFIG_IP6_NF_QUEUE=m |
353 | CONFIG_IP6_NF_IPTABLES=m | 348 | CONFIG_IP6_NF_IPTABLES=m |
354 | CONFIG_IP6_NF_MATCH_RT=m | 349 | CONFIG_IP6_NF_MATCH_AH=m |
355 | CONFIG_IP6_NF_MATCH_OPTS=m | 350 | CONFIG_IP6_NF_MATCH_EUI64=m |
356 | CONFIG_IP6_NF_MATCH_FRAG=m | 351 | CONFIG_IP6_NF_MATCH_FRAG=m |
352 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
357 | CONFIG_IP6_NF_MATCH_HL=m | 353 | CONFIG_IP6_NF_MATCH_HL=m |
358 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
359 | CONFIG_IP6_NF_MATCH_AH=m | ||
360 | CONFIG_IP6_NF_MATCH_MH=m | 355 | CONFIG_IP6_NF_MATCH_MH=m |
361 | CONFIG_IP6_NF_MATCH_EUI64=m | 356 | CONFIG_IP6_NF_MATCH_RT=m |
362 | CONFIG_IP6_NF_FILTER=m | ||
363 | CONFIG_IP6_NF_TARGET_LOG=m | 357 | CONFIG_IP6_NF_TARGET_LOG=m |
358 | CONFIG_IP6_NF_FILTER=m | ||
364 | CONFIG_IP6_NF_TARGET_REJECT=m | 359 | CONFIG_IP6_NF_TARGET_REJECT=m |
365 | CONFIG_IP6_NF_MANGLE=m | 360 | CONFIG_IP6_NF_MANGLE=m |
366 | CONFIG_IP6_NF_TARGET_HL=m | 361 | CONFIG_IP6_NF_TARGET_HL=m |
@@ -387,6 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
387 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
388 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
389 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
385 | # CONFIG_NET_DSA is not set | ||
390 | # CONFIG_VLAN_8021Q is not set | 386 | # CONFIG_VLAN_8021Q is not set |
391 | # CONFIG_DECNET is not set | 387 | # CONFIG_DECNET is not set |
392 | CONFIG_LLC=m | 388 | CONFIG_LLC=m |
@@ -410,19 +406,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
411 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
412 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
413 | 409 | # CONFIG_PHONET is not set | |
414 | # | 410 | # CONFIG_WIRELESS is not set |
415 | # Wireless | ||
416 | # | ||
417 | # CONFIG_CFG80211 is not set | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
420 | # CONFIG_MAC80211 is not set | ||
421 | CONFIG_IEEE80211=m | ||
422 | # CONFIG_IEEE80211_DEBUG is not set | ||
423 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
424 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
425 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
426 | # CONFIG_RFKILL is not set | 411 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 412 | # CONFIG_NET_9P is not set |
428 | 413 | ||
@@ -460,6 +445,7 @@ CONFIG_ATA_OVER_ETH=m | |||
460 | CONFIG_MISC_DEVICES=y | 445 | CONFIG_MISC_DEVICES=y |
461 | # CONFIG_EEPROM_93CX6 is not set | 446 | # CONFIG_EEPROM_93CX6 is not set |
462 | # CONFIG_ENCLOSURE_SERVICES is not set | 447 | # CONFIG_ENCLOSURE_SERVICES is not set |
448 | # CONFIG_C2PORT is not set | ||
463 | CONFIG_HAVE_IDE=y | 449 | CONFIG_HAVE_IDE=y |
464 | # CONFIG_IDE is not set | 450 | # CONFIG_IDE is not set |
465 | 451 | ||
@@ -544,6 +530,9 @@ CONFIG_MVME147_NET=y | |||
544 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 530 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
545 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 531 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
546 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 532 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
533 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
534 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
547 | # CONFIG_B44 is not set | 536 | # CONFIG_B44 is not set |
548 | # CONFIG_NETDEV_1000 is not set | 537 | # CONFIG_NETDEV_1000 is not set |
549 | # CONFIG_NETDEV_10000 is not set | 538 | # CONFIG_NETDEV_10000 is not set |
@@ -613,6 +602,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
613 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
614 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
615 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
616 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
617 | CONFIG_MOUSE_SERIAL=m | 607 | CONFIG_MOUSE_SERIAL=m |
618 | # CONFIG_MOUSE_VSXXXAA is not set | 608 | # CONFIG_MOUSE_VSXXXAA is not set |
@@ -667,11 +657,11 @@ CONFIG_GEN_RTC_X=y | |||
667 | # CONFIG_THERMAL is not set | 657 | # CONFIG_THERMAL is not set |
668 | # CONFIG_THERMAL_HWMON is not set | 658 | # CONFIG_THERMAL_HWMON is not set |
669 | # CONFIG_WATCHDOG is not set | 659 | # CONFIG_WATCHDOG is not set |
660 | CONFIG_SSB_POSSIBLE=y | ||
670 | 661 | ||
671 | # | 662 | # |
672 | # Sonics Silicon Backplane | 663 | # Sonics Silicon Backplane |
673 | # | 664 | # |
674 | CONFIG_SSB_POSSIBLE=y | ||
675 | # CONFIG_SSB is not set | 665 | # CONFIG_SSB is not set |
676 | 666 | ||
677 | # | 667 | # |
@@ -681,6 +671,7 @@ CONFIG_SSB_POSSIBLE=y | |||
681 | # CONFIG_MFD_SM501 is not set | 671 | # CONFIG_MFD_SM501 is not set |
682 | # CONFIG_HTC_PASIC3 is not set | 672 | # CONFIG_HTC_PASIC3 is not set |
683 | # CONFIG_MFD_TMIO is not set | 673 | # CONFIG_MFD_TMIO is not set |
674 | # CONFIG_REGULATOR is not set | ||
684 | 675 | ||
685 | # | 676 | # |
686 | # Multimedia devices | 677 | # Multimedia devices |
@@ -720,6 +711,12 @@ CONFIG_HID_SUPPORT=y | |||
720 | CONFIG_HID=m | 711 | CONFIG_HID=m |
721 | # CONFIG_HID_DEBUG is not set | 712 | # CONFIG_HID_DEBUG is not set |
722 | CONFIG_HIDRAW=y | 713 | CONFIG_HIDRAW=y |
714 | # CONFIG_HID_PID is not set | ||
715 | |||
716 | # | ||
717 | # Special HID drivers | ||
718 | # | ||
719 | CONFIG_HID_COMPAT=y | ||
723 | # CONFIG_USB_SUPPORT is not set | 720 | # CONFIG_USB_SUPPORT is not set |
724 | # CONFIG_MMC is not set | 721 | # CONFIG_MMC is not set |
725 | # CONFIG_MEMSTICK is not set | 722 | # CONFIG_MEMSTICK is not set |
@@ -728,6 +725,8 @@ CONFIG_HIDRAW=y | |||
728 | # CONFIG_RTC_CLASS is not set | 725 | # CONFIG_RTC_CLASS is not set |
729 | # CONFIG_DMADEVICES is not set | 726 | # CONFIG_DMADEVICES is not set |
730 | # CONFIG_UIO is not set | 727 | # CONFIG_UIO is not set |
728 | # CONFIG_STAGING is not set | ||
729 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
731 | 730 | ||
732 | # | 731 | # |
733 | # Character devices | 732 | # Character devices |
@@ -743,8 +742,9 @@ CONFIG_EXT2_FS=y | |||
743 | # CONFIG_EXT2_FS_XIP is not set | 742 | # CONFIG_EXT2_FS_XIP is not set |
744 | CONFIG_EXT3_FS=y | 743 | CONFIG_EXT3_FS=y |
745 | # CONFIG_EXT3_FS_XATTR is not set | 744 | # CONFIG_EXT3_FS_XATTR is not set |
746 | # CONFIG_EXT4DEV_FS is not set | 745 | # CONFIG_EXT4_FS is not set |
747 | CONFIG_JBD=y | 746 | CONFIG_JBD=y |
747 | CONFIG_JBD2=m | ||
748 | CONFIG_REISERFS_FS=m | 748 | CONFIG_REISERFS_FS=m |
749 | # CONFIG_REISERFS_CHECK is not set | 749 | # CONFIG_REISERFS_CHECK is not set |
750 | # CONFIG_REISERFS_PROC_INFO is not set | 750 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -755,6 +755,7 @@ CONFIG_JFS_FS=m | |||
755 | # CONFIG_JFS_DEBUG is not set | 755 | # CONFIG_JFS_DEBUG is not set |
756 | # CONFIG_JFS_STATISTICS is not set | 756 | # CONFIG_JFS_STATISTICS is not set |
757 | # CONFIG_FS_POSIX_ACL is not set | 757 | # CONFIG_FS_POSIX_ACL is not set |
758 | CONFIG_FILE_LOCKING=y | ||
758 | CONFIG_XFS_FS=m | 759 | CONFIG_XFS_FS=m |
759 | # CONFIG_XFS_QUOTA is not set | 760 | # CONFIG_XFS_QUOTA is not set |
760 | # CONFIG_XFS_POSIX_ACL is not set | 761 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -766,6 +767,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
766 | # CONFIG_OCFS2_FS_STATS is not set | 767 | # CONFIG_OCFS2_FS_STATS is not set |
767 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
768 | # CONFIG_OCFS2_DEBUG_FS is not set | 769 | # CONFIG_OCFS2_DEBUG_FS is not set |
770 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
769 | CONFIG_DNOTIFY=y | 771 | CONFIG_DNOTIFY=y |
770 | CONFIG_INOTIFY=y | 772 | CONFIG_INOTIFY=y |
771 | CONFIG_INOTIFY_USER=y | 773 | CONFIG_INOTIFY_USER=y |
@@ -804,6 +806,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
804 | CONFIG_PROC_FS=y | 806 | CONFIG_PROC_FS=y |
805 | CONFIG_PROC_KCORE=y | 807 | CONFIG_PROC_KCORE=y |
806 | CONFIG_PROC_SYSCTL=y | 808 | CONFIG_PROC_SYSCTL=y |
809 | CONFIG_PROC_PAGE_MONITOR=y | ||
807 | CONFIG_SYSFS=y | 810 | CONFIG_SYSFS=y |
808 | CONFIG_TMPFS=y | 811 | CONFIG_TMPFS=y |
809 | # CONFIG_TMPFS_POSIX_ACL is not set | 812 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -847,6 +850,7 @@ CONFIG_EXPORTFS=m | |||
847 | CONFIG_NFS_COMMON=y | 850 | CONFIG_NFS_COMMON=y |
848 | CONFIG_SUNRPC=y | 851 | CONFIG_SUNRPC=y |
849 | CONFIG_SUNRPC_GSS=y | 852 | CONFIG_SUNRPC_GSS=y |
853 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
850 | CONFIG_RPCSEC_GSS_KRB5=y | 854 | CONFIG_RPCSEC_GSS_KRB5=y |
851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
852 | CONFIG_SMB_FS=m | 856 | CONFIG_SMB_FS=m |
@@ -920,7 +924,13 @@ CONFIG_MAGIC_SYSRQ=y | |||
920 | # CONFIG_DEBUG_KERNEL is not set | 924 | # CONFIG_DEBUG_KERNEL is not set |
921 | CONFIG_DEBUG_BUGVERBOSE=y | 925 | CONFIG_DEBUG_BUGVERBOSE=y |
922 | CONFIG_DEBUG_MEMORY_INIT=y | 926 | CONFIG_DEBUG_MEMORY_INIT=y |
927 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
923 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 928 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
929 | |||
930 | # | ||
931 | # Tracers | ||
932 | # | ||
933 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
924 | # CONFIG_SAMPLES is not set | 934 | # CONFIG_SAMPLES is not set |
925 | 935 | ||
926 | # | 936 | # |
@@ -928,6 +938,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
928 | # | 938 | # |
929 | # CONFIG_KEYS is not set | 939 | # CONFIG_KEYS is not set |
930 | # CONFIG_SECURITY is not set | 940 | # CONFIG_SECURITY is not set |
941 | # CONFIG_SECURITYFS is not set | ||
931 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 942 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
932 | CONFIG_XOR_BLOCKS=m | 943 | CONFIG_XOR_BLOCKS=m |
933 | CONFIG_ASYNC_CORE=m | 944 | CONFIG_ASYNC_CORE=m |
@@ -938,10 +949,12 @@ CONFIG_CRYPTO=y | |||
938 | # | 949 | # |
939 | # Crypto core or helper | 950 | # Crypto core or helper |
940 | # | 951 | # |
952 | # CONFIG_CRYPTO_FIPS is not set | ||
941 | CONFIG_CRYPTO_ALGAPI=y | 953 | CONFIG_CRYPTO_ALGAPI=y |
942 | CONFIG_CRYPTO_AEAD=m | 954 | CONFIG_CRYPTO_AEAD=y |
943 | CONFIG_CRYPTO_BLKCIPHER=y | 955 | CONFIG_CRYPTO_BLKCIPHER=y |
944 | CONFIG_CRYPTO_HASH=y | 956 | CONFIG_CRYPTO_HASH=y |
957 | CONFIG_CRYPTO_RNG=y | ||
945 | CONFIG_CRYPTO_MANAGER=y | 958 | CONFIG_CRYPTO_MANAGER=y |
946 | CONFIG_CRYPTO_GF128MUL=m | 959 | CONFIG_CRYPTO_GF128MUL=m |
947 | CONFIG_CRYPTO_NULL=m | 960 | CONFIG_CRYPTO_NULL=m |
@@ -1015,14 +1028,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
1015 | # | 1028 | # |
1016 | CONFIG_CRYPTO_DEFLATE=m | 1029 | CONFIG_CRYPTO_DEFLATE=m |
1017 | CONFIG_CRYPTO_LZO=m | 1030 | CONFIG_CRYPTO_LZO=m |
1031 | |||
1032 | # | ||
1033 | # Random Number Generation | ||
1034 | # | ||
1035 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1018 | # CONFIG_CRYPTO_HW is not set | 1036 | # CONFIG_CRYPTO_HW is not set |
1019 | 1037 | ||
1020 | # | 1038 | # |
1021 | # Library routines | 1039 | # Library routines |
1022 | # | 1040 | # |
1023 | CONFIG_BITREVERSE=y | 1041 | CONFIG_BITREVERSE=y |
1024 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1025 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1026 | CONFIG_CRC_CCITT=m | 1042 | CONFIG_CRC_CCITT=m |
1027 | CONFIG_CRC16=m | 1043 | CONFIG_CRC16=m |
1028 | CONFIG_CRC_T10DIF=y | 1044 | CONFIG_CRC_T10DIF=y |