aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-05-07 05:17:13 -0400
committerIngo Molnar <mingo@elte.hu>2009-05-07 05:17:34 -0400
commit44347d947f628060b92449702071bfe1d31dfb75 (patch)
treec6ed74610d5b3295df4296659f80f5feb94b28cc /arch/m68k/configs
parentd94fc523f3c35bd8013f04827e94756cbc0212f4 (diff)
parent413f81eba35d6ede9289b0c8a920c013a84fac71 (diff)
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on on a handful of tracing fixes present in .30-rc5-almost. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/configs')
-rw-r--r--arch/m68k/configs/amiga_defconfig163
-rw-r--r--arch/m68k/configs/apollo_defconfig120
-rw-r--r--arch/m68k/configs/atari_defconfig155
-rw-r--r--arch/m68k/configs/bvme6000_defconfig119
-rw-r--r--arch/m68k/configs/hp300_defconfig120
-rw-r--r--arch/m68k/configs/mac_defconfig125
-rw-r--r--arch/m68k/configs/multi_defconfig157
-rw-r--r--arch/m68k/configs/mvme147_defconfig119
-rw-r--r--arch/m68k/configs/mvme16x_defconfig119
-rw-r--r--arch/m68k/configs/q40_defconfig122
-rw-r--r--arch/m68k/configs/sun3_defconfig120
-rw-r--r--arch/m68k/configs/sun3x_defconfig120
12 files changed, 1034 insertions, 525 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 23597beb66c1..0f69fa5ddf26 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:42 2008 4# Wed Apr 22 20:47:52 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -157,7 +169,7 @@ CONFIG_BINFMT_AOUT=m
157CONFIG_BINFMT_MISC=m 169CONFIG_BINFMT_MISC=m
158CONFIG_ZORRO=y 170CONFIG_ZORRO=y
159CONFIG_AMIGA_PCMCIA=y 171CONFIG_AMIGA_PCMCIA=y
160# CONFIG_HEARTBEAT is not set 172CONFIG_HEARTBEAT=y
161CONFIG_PROC_HARDWARE=y 173CONFIG_PROC_HARDWARE=y
162CONFIG_ISA=y 174CONFIG_ISA=y
163CONFIG_GENERIC_ISA_DMA=y 175CONFIG_GENERIC_ISA_DMA=y
@@ -184,7 +196,10 @@ CONFIG_INET=y
184# CONFIG_IP_MULTICAST is not set 196# CONFIG_IP_MULTICAST is not set
185# CONFIG_IP_ADVANCED_ROUTER is not set 197# CONFIG_IP_ADVANCED_ROUTER is not set
186CONFIG_IP_FIB_HASH=y 198CONFIG_IP_FIB_HASH=y
187# CONFIG_IP_PNP is not set 199CONFIG_IP_PNP=y
200# CONFIG_IP_PNP_DHCP is not set
201# CONFIG_IP_PNP_BOOTP is not set
202# CONFIG_IP_PNP_RARP is not set
188CONFIG_NET_IPIP=m 203CONFIG_NET_IPIP=m
189CONFIG_NET_IPGRE=m 204CONFIG_NET_IPGRE=m
190# CONFIG_ARPD is not set 205# CONFIG_ARPD is not set
@@ -258,6 +273,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 273CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 274CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 275CONFIG_NETFILTER_XT_TARGET_DSCP=m
276CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 277CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 278CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 279CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +282,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 282CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 283CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 284CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
285CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 286CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 287CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +293,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 293CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 294CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 295CONFIG_NETFILTER_XT_MATCH_HELPER=m
296CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 297CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 298CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 299CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +372,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 372CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 373CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 374CONFIG_IP6_NF_MATCH_RT=m
375CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 376CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 377CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 378CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 379CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 380CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 381CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 382CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 383
367# 384#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 385# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 386#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 387# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 388# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 389CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 390# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 391# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +407,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 407# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 408# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 409# CONFIG_WAN_ROUTER is not set
410# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 411# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 412CONFIG_NET_CLS_ROUTE=y
413# CONFIG_DCB is not set
399 414
400# 415#
401# Network testing 416# Network testing
@@ -406,8 +421,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 421# CONFIG_IRDA is not set
407# CONFIG_BT is not set 422# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 423# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 424# CONFIG_WIRELESS is not set
425# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
413 428
@@ -453,15 +468,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
453CONFIG_ATA_OVER_ETH=m 468CONFIG_ATA_OVER_ETH=m
454# CONFIG_BLK_DEV_HD is not set 469# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 470CONFIG_MISC_DEVICES=y
456# CONFIG_EEPROM_93CX6 is not set
457# CONFIG_ENCLOSURE_SERVICES is not set 471# CONFIG_ENCLOSURE_SERVICES is not set
458# CONFIG_C2PORT is not set 472# CONFIG_C2PORT is not set
473
474#
475# EEPROM support
476#
477# CONFIG_EEPROM_93CX6 is not set
459CONFIG_HAVE_IDE=y 478CONFIG_HAVE_IDE=y
460CONFIG_IDE=y 479CONFIG_IDE=y
461 480
462# 481#
463# Please see Documentation/ide/ide.txt for help/info on IDE drives 482# Please see Documentation/ide/ide.txt for help/info on IDE drives
464# 483#
484CONFIG_IDE_ATAPI=y
465# CONFIG_BLK_DEV_IDE_SATA is not set 485# CONFIG_BLK_DEV_IDE_SATA is not set
466CONFIG_IDE_GD=y 486CONFIG_IDE_GD=y
467CONFIG_IDE_GD_ATA=y 487CONFIG_IDE_GD_ATA=y
@@ -469,7 +489,6 @@ CONFIG_IDE_GD_ATA=y
469CONFIG_BLK_DEV_IDECD=y 489CONFIG_BLK_DEV_IDECD=y
470CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 490CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
471# CONFIG_BLK_DEV_IDETAPE is not set 491# CONFIG_BLK_DEV_IDETAPE is not set
472# CONFIG_BLK_DEV_IDESCSI is not set
473# CONFIG_IDE_TASK_IOCTL is not set 492# CONFIG_IDE_TASK_IOCTL is not set
474CONFIG_IDE_PROC_FS=y 493CONFIG_IDE_PROC_FS=y
475 494
@@ -478,7 +497,6 @@ CONFIG_IDE_PROC_FS=y
478# 497#
479# CONFIG_BLK_DEV_PLATFORM is not set 498# CONFIG_BLK_DEV_PLATFORM is not set
480CONFIG_BLK_DEV_GAYLE=y 499CONFIG_BLK_DEV_GAYLE=y
481CONFIG_BLK_DEV_IDEDOUBLER=y
482CONFIG_BLK_DEV_BUDDHA=y 500CONFIG_BLK_DEV_BUDDHA=y
483# CONFIG_BLK_DEV_IDEDMA is not set 501# CONFIG_BLK_DEV_IDEDMA is not set
484 502
@@ -530,6 +548,8 @@ CONFIG_ISCSI_TCP=m
530# CONFIG_SCSI_AIC7XXX_OLD is not set 548# CONFIG_SCSI_AIC7XXX_OLD is not set
531# CONFIG_SCSI_ADVANSYS is not set 549# CONFIG_SCSI_ADVANSYS is not set
532# CONFIG_SCSI_IN2000 is not set 550# CONFIG_SCSI_IN2000 is not set
551# CONFIG_LIBFC is not set
552# CONFIG_LIBFCOE is not set
533# CONFIG_SCSI_DTC3280 is not set 553# CONFIG_SCSI_DTC3280 is not set
534# CONFIG_SCSI_FUTURE_DOMAIN is not set 554# CONFIG_SCSI_FUTURE_DOMAIN is not set
535# CONFIG_SCSI_GENERIC_NCR5380 is not set 555# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -547,6 +567,7 @@ CONFIG_GVP11_SCSI=y
547CONFIG_SCSI_A4000T=y 567CONFIG_SCSI_A4000T=y
548CONFIG_SCSI_ZORRO7XX=y 568CONFIG_SCSI_ZORRO7XX=y
549# CONFIG_SCSI_DH is not set 569# CONFIG_SCSI_DH is not set
570# CONFIG_SCSI_OSD_INITIATOR is not set
550CONFIG_MD=y 571CONFIG_MD=y
551CONFIG_BLK_DEV_MD=m 572CONFIG_BLK_DEV_MD=m
552CONFIG_MD_LINEAR=m 573CONFIG_MD_LINEAR=m
@@ -554,7 +575,7 @@ CONFIG_MD_RAID0=m
554CONFIG_MD_RAID1=m 575CONFIG_MD_RAID1=m
555# CONFIG_MD_RAID10 is not set 576# CONFIG_MD_RAID10 is not set
556CONFIG_MD_RAID456=m 577CONFIG_MD_RAID456=m
557CONFIG_MD_RAID5_RESHAPE=y 578CONFIG_MD_RAID6_PQ=m
558# CONFIG_MD_MULTIPATH is not set 579# CONFIG_MD_MULTIPATH is not set
559# CONFIG_MD_FAULTY is not set 580# CONFIG_MD_FAULTY is not set
560CONFIG_BLK_DEV_DM=m 581CONFIG_BLK_DEV_DM=m
@@ -567,6 +588,7 @@ CONFIG_DM_MULTIPATH=m
567# CONFIG_DM_DELAY is not set 588# CONFIG_DM_DELAY is not set
568CONFIG_DM_UEVENT=y 589CONFIG_DM_UEVENT=y
569CONFIG_NETDEVICES=y 590CONFIG_NETDEVICES=y
591CONFIG_COMPAT_NET_DEV_OPS=y
570CONFIG_DUMMY=m 592CONFIG_DUMMY=m
571# CONFIG_BONDING is not set 593# CONFIG_BONDING is not set
572CONFIG_MACVLAN=m 594CONFIG_MACVLAN=m
@@ -577,14 +599,16 @@ CONFIG_VETH=m
577# CONFIG_PHYLIB is not set 599# CONFIG_PHYLIB is not set
578CONFIG_NET_ETHERNET=y 600CONFIG_NET_ETHERNET=y
579# CONFIG_MII is not set 601# CONFIG_MII is not set
580CONFIG_ARIADNE=m 602CONFIG_ARIADNE=y
581CONFIG_A2065=m 603CONFIG_A2065=y
582CONFIG_HYDRA=m 604CONFIG_HYDRA=y
583CONFIG_ZORRO8390=m 605CONFIG_ZORRO8390=y
584CONFIG_APNE=m 606CONFIG_APNE=y
585# CONFIG_NET_VENDOR_3COM is not set 607# CONFIG_NET_VENDOR_3COM is not set
586# CONFIG_NET_VENDOR_SMC is not set 608# CONFIG_NET_VENDOR_SMC is not set
609# CONFIG_ETHOC is not set
587# CONFIG_NET_VENDOR_RACAL is not set 610# CONFIG_NET_VENDOR_RACAL is not set
611# CONFIG_DNET is not set
588# CONFIG_AT1700 is not set 612# CONFIG_AT1700 is not set
589# CONFIG_DEPCA is not set 613# CONFIG_DEPCA is not set
590# CONFIG_HP100 is not set 614# CONFIG_HP100 is not set
@@ -609,7 +633,10 @@ CONFIG_APNE=m
609# 633#
610# CONFIG_WLAN_PRE80211 is not set 634# CONFIG_WLAN_PRE80211 is not set
611# CONFIG_WLAN_80211 is not set 635# CONFIG_WLAN_80211 is not set
612# CONFIG_IWLWIFI_LEDS is not set 636
637#
638# Enable WiMAX (Networking options) to see the WiMAX drivers
639#
613# CONFIG_WAN is not set 640# CONFIG_WAN is not set
614# CONFIG_PLIP is not set 641# CONFIG_PLIP is not set
615CONFIG_PPP=m 642CONFIG_PPP=m
@@ -719,7 +746,7 @@ CONFIG_HW_CONSOLE=y
719CONFIG_VT_HW_CONSOLE_BINDING=y 746CONFIG_VT_HW_CONSOLE_BINDING=y
720# CONFIG_DEVKMEM is not set 747# CONFIG_DEVKMEM is not set
721# CONFIG_SERIAL_NONSTANDARD is not set 748# CONFIG_SERIAL_NONSTANDARD is not set
722CONFIG_A2232=m 749CONFIG_A2232=y
723 750
724# 751#
725# Serial drivers 752# Serial drivers
@@ -730,6 +757,7 @@ CONFIG_A2232=m
730# Non-8250 serial port support 757# Non-8250 serial port support
731# 758#
732CONFIG_UNIX98_PTYS=y 759CONFIG_UNIX98_PTYS=y
760# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
733CONFIG_LEGACY_PTYS=y 761CONFIG_LEGACY_PTYS=y
734CONFIG_LEGACY_PTY_COUNT=256 762CONFIG_LEGACY_PTY_COUNT=256
735CONFIG_PRINTER=m 763CONFIG_PRINTER=m
@@ -821,6 +849,7 @@ CONFIG_FB_FM2=y
821# CONFIG_FB_VIRTUAL is not set 849# CONFIG_FB_VIRTUAL is not set
822# CONFIG_FB_METRONOME is not set 850# CONFIG_FB_METRONOME is not set
823# CONFIG_FB_MB862XX is not set 851# CONFIG_FB_MB862XX is not set
852# CONFIG_FB_BROADSHEET is not set
824# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 853# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
825 854
826# 855#
@@ -856,7 +885,6 @@ CONFIG_HIDRAW=y
856# 885#
857# Special HID drivers 886# Special HID drivers
858# 887#
859CONFIG_HID_COMPAT=y
860# CONFIG_USB_SUPPORT is not set 888# CONFIG_USB_SUPPORT is not set
861# CONFIG_MMC is not set 889# CONFIG_MMC is not set
862# CONFIG_MEMSTICK is not set 890# CONFIG_MEMSTICK is not set
@@ -867,14 +895,13 @@ CONFIG_HID_COMPAT=y
867# CONFIG_AUXDISPLAY is not set 895# CONFIG_AUXDISPLAY is not set
868# CONFIG_UIO is not set 896# CONFIG_UIO is not set
869# CONFIG_STAGING is not set 897# CONFIG_STAGING is not set
870CONFIG_STAGING_EXCLUDE_BUILD=y
871 898
872# 899#
873# Character devices 900# Character devices
874# 901#
875CONFIG_AMIGA_BUILTIN_SERIAL=y 902CONFIG_AMIGA_BUILTIN_SERIAL=y
876CONFIG_MULTIFACE_III_TTY=m 903CONFIG_MULTIFACE_III_TTY=m
877# CONFIG_SERIAL_CONSOLE is not set 904CONFIG_SERIAL_CONSOLE=y
878 905
879# 906#
880# File systems 907# File systems
@@ -883,6 +910,7 @@ CONFIG_EXT2_FS=y
883# CONFIG_EXT2_FS_XATTR is not set 910# CONFIG_EXT2_FS_XATTR is not set
884# CONFIG_EXT2_FS_XIP is not set 911# CONFIG_EXT2_FS_XIP is not set
885CONFIG_EXT3_FS=y 912CONFIG_EXT3_FS=y
913# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
886# CONFIG_EXT3_FS_XATTR is not set 914# CONFIG_EXT3_FS_XATTR is not set
887# CONFIG_EXT4_FS is not set 915# CONFIG_EXT4_FS is not set
888CONFIG_JBD=y 916CONFIG_JBD=y
@@ -909,13 +937,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
909# CONFIG_OCFS2_FS_STATS is not set 937# CONFIG_OCFS2_FS_STATS is not set
910# CONFIG_OCFS2_DEBUG_MASKLOG is not set 938# CONFIG_OCFS2_DEBUG_MASKLOG is not set
911# CONFIG_OCFS2_DEBUG_FS is not set 939# CONFIG_OCFS2_DEBUG_FS is not set
912# CONFIG_OCFS2_COMPAT_JBD is not set 940# CONFIG_OCFS2_FS_POSIX_ACL is not set
941# CONFIG_BTRFS_FS is not set
913CONFIG_DNOTIFY=y 942CONFIG_DNOTIFY=y
914CONFIG_INOTIFY=y 943CONFIG_INOTIFY=y
915CONFIG_INOTIFY_USER=y 944CONFIG_INOTIFY_USER=y
916CONFIG_QUOTA=y 945CONFIG_QUOTA=y
917CONFIG_QUOTA_NETLINK_INTERFACE=y 946CONFIG_QUOTA_NETLINK_INTERFACE=y
918# CONFIG_PRINT_QUOTA_WARNING is not set 947# CONFIG_PRINT_QUOTA_WARNING is not set
948CONFIG_QUOTA_TREE=m
919# CONFIG_QFMT_V1 is not set 949# CONFIG_QFMT_V1 is not set
920# CONFIG_QFMT_V2 is not set 950# CONFIG_QFMT_V2 is not set
921CONFIG_QUOTACTL=y 951CONFIG_QUOTACTL=y
@@ -924,6 +954,11 @@ CONFIG_AUTOFS4_FS=m
924CONFIG_FUSE_FS=m 954CONFIG_FUSE_FS=m
925 955
926# 956#
957# Caches
958#
959# CONFIG_FSCACHE is not set
960
961#
927# CD-ROM/DVD Filesystems 962# CD-ROM/DVD Filesystems
928# 963#
929CONFIG_ISO9660_FS=y 964CONFIG_ISO9660_FS=y
@@ -935,8 +970,8 @@ CONFIG_UDF_NLS=y
935# 970#
936# DOS/FAT/NT Filesystems 971# DOS/FAT/NT Filesystems
937# 972#
938CONFIG_FAT_FS=m 973CONFIG_FAT_FS=y
939CONFIG_MSDOS_FS=m 974CONFIG_MSDOS_FS=y
940CONFIG_VFAT_FS=m 975CONFIG_VFAT_FS=m
941CONFIG_FAT_DEFAULT_CODEPAGE=437 976CONFIG_FAT_DEFAULT_CODEPAGE=437
942CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 977CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -954,10 +989,7 @@ CONFIG_TMPFS=y
954# CONFIG_TMPFS_POSIX_ACL is not set 989# CONFIG_TMPFS_POSIX_ACL is not set
955# CONFIG_HUGETLB_PAGE is not set 990# CONFIG_HUGETLB_PAGE is not set
956CONFIG_CONFIGFS_FS=m 991CONFIG_CONFIGFS_FS=m
957 992CONFIG_MISC_FILESYSTEMS=y
958#
959# Miscellaneous filesystems
960#
961# CONFIG_ADFS_FS is not set 993# CONFIG_ADFS_FS is not set
962CONFIG_AFFS_FS=m 994CONFIG_AFFS_FS=m
963CONFIG_HFS_FS=m 995CONFIG_HFS_FS=m
@@ -966,6 +998,9 @@ CONFIG_HFSPLUS_FS=m
966# CONFIG_BFS_FS is not set 998# CONFIG_BFS_FS is not set
967# CONFIG_EFS_FS is not set 999# CONFIG_EFS_FS is not set
968CONFIG_CRAMFS=m 1000CONFIG_CRAMFS=m
1001CONFIG_SQUASHFS=m
1002# CONFIG_SQUASHFS_EMBEDDED is not set
1003CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
969# CONFIG_VXFS_FS is not set 1004# CONFIG_VXFS_FS is not set
970CONFIG_MINIX_FS=y 1005CONFIG_MINIX_FS=y
971# CONFIG_OMFS_FS is not set 1006# CONFIG_OMFS_FS is not set
@@ -976,23 +1011,24 @@ CONFIG_SYSV_FS=m
976CONFIG_UFS_FS=m 1011CONFIG_UFS_FS=m
977# CONFIG_UFS_FS_WRITE is not set 1012# CONFIG_UFS_FS_WRITE is not set
978# CONFIG_UFS_DEBUG is not set 1013# CONFIG_UFS_DEBUG is not set
1014# CONFIG_NILFS2_FS is not set
979CONFIG_NETWORK_FILESYSTEMS=y 1015CONFIG_NETWORK_FILESYSTEMS=y
980CONFIG_NFS_FS=m 1016CONFIG_NFS_FS=y
981CONFIG_NFS_V3=y 1017CONFIG_NFS_V3=y
982# CONFIG_NFS_V3_ACL is not set 1018# CONFIG_NFS_V3_ACL is not set
983CONFIG_NFS_V4=y 1019CONFIG_NFS_V4=y
1020# CONFIG_ROOT_NFS is not set
984CONFIG_NFSD=m 1021CONFIG_NFSD=m
985CONFIG_NFSD_V3=y 1022CONFIG_NFSD_V3=y
986# CONFIG_NFSD_V3_ACL is not set 1023# CONFIG_NFSD_V3_ACL is not set
987# CONFIG_NFSD_V4 is not set 1024# CONFIG_NFSD_V4 is not set
988CONFIG_LOCKD=m 1025CONFIG_LOCKD=y
989CONFIG_LOCKD_V4=y 1026CONFIG_LOCKD_V4=y
990CONFIG_EXPORTFS=m 1027CONFIG_EXPORTFS=m
991CONFIG_NFS_COMMON=y 1028CONFIG_NFS_COMMON=y
992CONFIG_SUNRPC=m 1029CONFIG_SUNRPC=y
993CONFIG_SUNRPC_GSS=m 1030CONFIG_SUNRPC_GSS=y
994# CONFIG_SUNRPC_REGISTER_V4 is not set 1031CONFIG_RPCSEC_GSS_KRB5=y
995CONFIG_RPCSEC_GSS_KRB5=m
996# CONFIG_RPCSEC_GSS_SPKM3 is not set 1032# CONFIG_RPCSEC_GSS_SPKM3 is not set
997CONFIG_SMB_FS=m 1033CONFIG_SMB_FS=m
998CONFIG_SMB_NLS_DEFAULT=y 1034CONFIG_SMB_NLS_DEFAULT=y
@@ -1067,11 +1103,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1067CONFIG_DEBUG_MEMORY_INIT=y 1103CONFIG_DEBUG_MEMORY_INIT=y
1068# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1104# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1069CONFIG_SYSCTL_SYSCALL_CHECK=y 1105CONFIG_SYSCTL_SYSCALL_CHECK=y
1070
1071#
1072# Tracers
1073#
1074# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1075# CONFIG_SAMPLES is not set 1106# CONFIG_SAMPLES is not set
1076 1107
1077# 1108#
@@ -1092,13 +1123,21 @@ CONFIG_CRYPTO=y
1092# 1123#
1093# CONFIG_CRYPTO_FIPS is not set 1124# CONFIG_CRYPTO_FIPS is not set
1094CONFIG_CRYPTO_ALGAPI=y 1125CONFIG_CRYPTO_ALGAPI=y
1095CONFIG_CRYPTO_AEAD=y 1126CONFIG_CRYPTO_ALGAPI2=y
1127CONFIG_CRYPTO_AEAD=m
1128CONFIG_CRYPTO_AEAD2=y
1096CONFIG_CRYPTO_BLKCIPHER=y 1129CONFIG_CRYPTO_BLKCIPHER=y
1130CONFIG_CRYPTO_BLKCIPHER2=y
1097CONFIG_CRYPTO_HASH=y 1131CONFIG_CRYPTO_HASH=y
1098CONFIG_CRYPTO_RNG=y 1132CONFIG_CRYPTO_HASH2=y
1133CONFIG_CRYPTO_RNG=m
1134CONFIG_CRYPTO_RNG2=y
1135CONFIG_CRYPTO_PCOMP=y
1099CONFIG_CRYPTO_MANAGER=y 1136CONFIG_CRYPTO_MANAGER=y
1137CONFIG_CRYPTO_MANAGER2=y
1100CONFIG_CRYPTO_GF128MUL=m 1138CONFIG_CRYPTO_GF128MUL=m
1101CONFIG_CRYPTO_NULL=m 1139CONFIG_CRYPTO_NULL=m
1140CONFIG_CRYPTO_WORKQUEUE=y
1102CONFIG_CRYPTO_CRYPTD=m 1141CONFIG_CRYPTO_CRYPTD=m
1103CONFIG_CRYPTO_AUTHENC=m 1142CONFIG_CRYPTO_AUTHENC=m
1104CONFIG_CRYPTO_TEST=m 1143CONFIG_CRYPTO_TEST=m
@@ -1113,7 +1152,7 @@ CONFIG_CRYPTO_SEQIV=m
1113# 1152#
1114# Block modes 1153# Block modes
1115# 1154#
1116CONFIG_CRYPTO_CBC=m 1155CONFIG_CRYPTO_CBC=y
1117CONFIG_CRYPTO_CTR=m 1156CONFIG_CRYPTO_CTR=m
1118CONFIG_CRYPTO_CTS=m 1157CONFIG_CRYPTO_CTS=m
1119CONFIG_CRYPTO_ECB=m 1158CONFIG_CRYPTO_ECB=m
@@ -1132,7 +1171,7 @@ CONFIG_CRYPTO_XCBC=m
1132# 1171#
1133CONFIG_CRYPTO_CRC32C=m 1172CONFIG_CRYPTO_CRC32C=m
1134CONFIG_CRYPTO_MD4=m 1173CONFIG_CRYPTO_MD4=m
1135CONFIG_CRYPTO_MD5=m 1174CONFIG_CRYPTO_MD5=y
1136CONFIG_CRYPTO_MICHAEL_MIC=m 1175CONFIG_CRYPTO_MICHAEL_MIC=m
1137CONFIG_CRYPTO_RMD128=m 1176CONFIG_CRYPTO_RMD128=m
1138CONFIG_CRYPTO_RMD160=m 1177CONFIG_CRYPTO_RMD160=m
@@ -1154,7 +1193,7 @@ CONFIG_CRYPTO_BLOWFISH=m
1154CONFIG_CRYPTO_CAMELLIA=m 1193CONFIG_CRYPTO_CAMELLIA=m
1155CONFIG_CRYPTO_CAST5=m 1194CONFIG_CRYPTO_CAST5=m
1156CONFIG_CRYPTO_CAST6=m 1195CONFIG_CRYPTO_CAST6=m
1157CONFIG_CRYPTO_DES=m 1196CONFIG_CRYPTO_DES=y
1158CONFIG_CRYPTO_FCRYPT=m 1197CONFIG_CRYPTO_FCRYPT=m
1159CONFIG_CRYPTO_KHAZAD=m 1198CONFIG_CRYPTO_KHAZAD=m
1160CONFIG_CRYPTO_SALSA20=m 1199CONFIG_CRYPTO_SALSA20=m
@@ -1168,6 +1207,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1168# Compression 1207# Compression
1169# 1208#
1170CONFIG_CRYPTO_DEFLATE=m 1209CONFIG_CRYPTO_DEFLATE=m
1210CONFIG_CRYPTO_ZLIB=m
1171CONFIG_CRYPTO_LZO=m 1211CONFIG_CRYPTO_LZO=m
1172 1212
1173# 1213#
@@ -1175,11 +1215,13 @@ CONFIG_CRYPTO_LZO=m
1175# 1215#
1176# CONFIG_CRYPTO_ANSI_CPRNG is not set 1216# CONFIG_CRYPTO_ANSI_CPRNG is not set
1177# CONFIG_CRYPTO_HW is not set 1217# CONFIG_CRYPTO_HW is not set
1218# CONFIG_BINARY_PRINTF is not set
1178 1219
1179# 1220#
1180# Library routines 1221# Library routines
1181# 1222#
1182CONFIG_BITREVERSE=y 1223CONFIG_BITREVERSE=y
1224CONFIG_GENERIC_FIND_LAST_BIT=y
1183CONFIG_CRC_CCITT=m 1225CONFIG_CRC_CCITT=m
1184CONFIG_CRC16=m 1226CONFIG_CRC16=m
1185CONFIG_CRC_T10DIF=y 1227CONFIG_CRC_T10DIF=y
@@ -1191,10 +1233,13 @@ CONFIG_ZLIB_INFLATE=y
1191CONFIG_ZLIB_DEFLATE=m 1233CONFIG_ZLIB_DEFLATE=m
1192CONFIG_LZO_COMPRESS=m 1234CONFIG_LZO_COMPRESS=m
1193CONFIG_LZO_DECOMPRESS=m 1235CONFIG_LZO_DECOMPRESS=m
1236CONFIG_DECOMPRESS_GZIP=y
1237CONFIG_DECOMPRESS_BZIP2=y
1238CONFIG_DECOMPRESS_LZMA=y
1194CONFIG_TEXTSEARCH=y 1239CONFIG_TEXTSEARCH=y
1195CONFIG_TEXTSEARCH_KMP=m 1240CONFIG_TEXTSEARCH_KMP=m
1196CONFIG_TEXTSEARCH_BM=m 1241CONFIG_TEXTSEARCH_BM=m
1197CONFIG_TEXTSEARCH_FSM=m 1242CONFIG_TEXTSEARCH_FSM=m
1198CONFIG_PLIST=y
1199CONFIG_HAS_IOMEM=y 1243CONFIG_HAS_IOMEM=y
1200CONFIG_HAS_DMA=y 1244CONFIG_HAS_DMA=y
1245CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 935108d115a0..5fff58196b3e 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:43 2008 4# Wed Apr 22 20:47:54 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -256,6 +268,7 @@ CONFIG_NETFILTER_XTABLES=m
256CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 268CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
257CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 269CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
258CONFIG_NETFILTER_XT_TARGET_DSCP=m 270CONFIG_NETFILTER_XT_TARGET_DSCP=m
271CONFIG_NETFILTER_XT_TARGET_HL=m
259CONFIG_NETFILTER_XT_TARGET_MARK=m 272CONFIG_NETFILTER_XT_TARGET_MARK=m
260CONFIG_NETFILTER_XT_TARGET_NFLOG=m 273CONFIG_NETFILTER_XT_TARGET_NFLOG=m
261CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 274CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -264,6 +277,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
264CONFIG_NETFILTER_XT_TARGET_TRACE=m 277CONFIG_NETFILTER_XT_TARGET_TRACE=m
265CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 278CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
266CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 279CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
280CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
267CONFIG_NETFILTER_XT_MATCH_COMMENT=m 281CONFIG_NETFILTER_XT_MATCH_COMMENT=m
268CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 282CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
269CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 283CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -274,6 +288,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
274CONFIG_NETFILTER_XT_MATCH_ESP=m 288CONFIG_NETFILTER_XT_MATCH_ESP=m
275CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 289CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
276CONFIG_NETFILTER_XT_MATCH_HELPER=m 290CONFIG_NETFILTER_XT_MATCH_HELPER=m
291CONFIG_NETFILTER_XT_MATCH_HL=m
277CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 292CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
278CONFIG_NETFILTER_XT_MATCH_LENGTH=m 293CONFIG_NETFILTER_XT_MATCH_LENGTH=m
279CONFIG_NETFILTER_XT_MATCH_LIMIT=m 294CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -352,25 +367,20 @@ CONFIG_IP6_NF_MATCH_HL=m
352CONFIG_IP6_NF_MATCH_IPV6HEADER=m 367CONFIG_IP6_NF_MATCH_IPV6HEADER=m
353CONFIG_IP6_NF_MATCH_MH=m 368CONFIG_IP6_NF_MATCH_MH=m
354CONFIG_IP6_NF_MATCH_RT=m 369CONFIG_IP6_NF_MATCH_RT=m
370CONFIG_IP6_NF_TARGET_HL=m
355CONFIG_IP6_NF_TARGET_LOG=m 371CONFIG_IP6_NF_TARGET_LOG=m
356CONFIG_IP6_NF_FILTER=m 372CONFIG_IP6_NF_FILTER=m
357CONFIG_IP6_NF_TARGET_REJECT=m 373CONFIG_IP6_NF_TARGET_REJECT=m
358CONFIG_IP6_NF_MANGLE=m 374CONFIG_IP6_NF_MANGLE=m
359CONFIG_IP6_NF_TARGET_HL=m
360CONFIG_IP6_NF_RAW=m 375CONFIG_IP6_NF_RAW=m
361CONFIG_IP_DCCP=m 376CONFIG_IP_DCCP=m
362CONFIG_INET_DCCP_DIAG=m 377CONFIG_INET_DCCP_DIAG=m
363CONFIG_IP_DCCP_ACKVEC=y
364 378
365# 379#
366# DCCP CCIDs Configuration (EXPERIMENTAL) 380# DCCP CCIDs Configuration (EXPERIMENTAL)
367# 381#
368CONFIG_IP_DCCP_CCID2=m
369# CONFIG_IP_DCCP_CCID2_DEBUG is not set 382# CONFIG_IP_DCCP_CCID2_DEBUG is not set
370CONFIG_IP_DCCP_CCID3=m 383# CONFIG_IP_DCCP_CCID3 is not set
371# CONFIG_IP_DCCP_CCID3_DEBUG is not set
372CONFIG_IP_DCCP_CCID3_RTO=100
373CONFIG_IP_DCCP_TFRC_LIB=m
374CONFIG_IP_SCTP=m 384CONFIG_IP_SCTP=m
375# CONFIG_SCTP_DBG_MSG is not set 385# CONFIG_SCTP_DBG_MSG is not set
376# CONFIG_SCTP_DBG_OBJCNT is not set 386# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -392,8 +402,10 @@ CONFIG_ATALK=m
392# CONFIG_LAPB is not set 402# CONFIG_LAPB is not set
393# CONFIG_ECONET is not set 403# CONFIG_ECONET is not set
394# CONFIG_WAN_ROUTER is not set 404# CONFIG_WAN_ROUTER is not set
405# CONFIG_PHONET is not set
395# CONFIG_NET_SCHED is not set 406# CONFIG_NET_SCHED is not set
396CONFIG_NET_CLS_ROUTE=y 407CONFIG_NET_CLS_ROUTE=y
408# CONFIG_DCB is not set
397 409
398# 410#
399# Network testing 411# Network testing
@@ -404,8 +416,8 @@ CONFIG_NET_CLS_ROUTE=y
404# CONFIG_IRDA is not set 416# CONFIG_IRDA is not set
405# CONFIG_BT is not set 417# CONFIG_BT is not set
406# CONFIG_AF_RXRPC is not set 418# CONFIG_AF_RXRPC is not set
407# CONFIG_PHONET is not set
408# CONFIG_WIRELESS is not set 419# CONFIG_WIRELESS is not set
420# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
411 423
@@ -441,9 +453,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
441CONFIG_ATA_OVER_ETH=m 453CONFIG_ATA_OVER_ETH=m
442# CONFIG_BLK_DEV_HD is not set 454# CONFIG_BLK_DEV_HD is not set
443CONFIG_MISC_DEVICES=y 455CONFIG_MISC_DEVICES=y
444# CONFIG_EEPROM_93CX6 is not set
445# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
446# CONFIG_C2PORT is not set 457# CONFIG_C2PORT is not set
458
459#
460# EEPROM support
461#
462# CONFIG_EEPROM_93CX6 is not set
447CONFIG_HAVE_IDE=y 463CONFIG_HAVE_IDE=y
448# CONFIG_IDE is not set 464# CONFIG_IDE is not set
449 465
@@ -491,8 +507,11 @@ CONFIG_SCSI_SRP_ATTRS=m
491CONFIG_SCSI_SRP_TGT_ATTRS=y 507CONFIG_SCSI_SRP_TGT_ATTRS=y
492CONFIG_SCSI_LOWLEVEL=y 508CONFIG_SCSI_LOWLEVEL=y
493CONFIG_ISCSI_TCP=m 509CONFIG_ISCSI_TCP=m
510# CONFIG_LIBFC is not set
511# CONFIG_LIBFCOE is not set
494# CONFIG_SCSI_DEBUG is not set 512# CONFIG_SCSI_DEBUG is not set
495# CONFIG_SCSI_DH is not set 513# CONFIG_SCSI_DH is not set
514# CONFIG_SCSI_OSD_INITIATOR is not set
496CONFIG_MD=y 515CONFIG_MD=y
497CONFIG_BLK_DEV_MD=m 516CONFIG_BLK_DEV_MD=m
498CONFIG_MD_LINEAR=m 517CONFIG_MD_LINEAR=m
@@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m
500CONFIG_MD_RAID1=m 519CONFIG_MD_RAID1=m
501# CONFIG_MD_RAID10 is not set 520# CONFIG_MD_RAID10 is not set
502CONFIG_MD_RAID456=m 521CONFIG_MD_RAID456=m
503CONFIG_MD_RAID5_RESHAPE=y 522CONFIG_MD_RAID6_PQ=m
504# CONFIG_MD_MULTIPATH is not set 523# CONFIG_MD_MULTIPATH is not set
505# CONFIG_MD_FAULTY is not set 524# CONFIG_MD_FAULTY is not set
506CONFIG_BLK_DEV_DM=m 525CONFIG_BLK_DEV_DM=m
@@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m
513# CONFIG_DM_DELAY is not set 532# CONFIG_DM_DELAY is not set
514CONFIG_DM_UEVENT=y 533CONFIG_DM_UEVENT=y
515CONFIG_NETDEVICES=y 534CONFIG_NETDEVICES=y
535CONFIG_COMPAT_NET_DEV_OPS=y
516CONFIG_DUMMY=m 536CONFIG_DUMMY=m
517# CONFIG_BONDING is not set 537# CONFIG_BONDING is not set
518CONFIG_MACVLAN=m 538CONFIG_MACVLAN=m
@@ -522,6 +542,8 @@ CONFIG_VETH=m
522# CONFIG_PHYLIB is not set 542# CONFIG_PHYLIB is not set
523CONFIG_NET_ETHERNET=y 543CONFIG_NET_ETHERNET=y
524# CONFIG_MII is not set 544# CONFIG_MII is not set
545# CONFIG_ETHOC is not set
546# CONFIG_DNET is not set
525# CONFIG_IBM_NEW_EMAC_ZMII is not set 547# CONFIG_IBM_NEW_EMAC_ZMII is not set
526# CONFIG_IBM_NEW_EMAC_RGMII is not set 548# CONFIG_IBM_NEW_EMAC_RGMII is not set
527# CONFIG_IBM_NEW_EMAC_TAH is not set 549# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -538,7 +560,10 @@ CONFIG_NET_ETHERNET=y
538# 560#
539# CONFIG_WLAN_PRE80211 is not set 561# CONFIG_WLAN_PRE80211 is not set
540# CONFIG_WLAN_80211 is not set 562# CONFIG_WLAN_80211 is not set
541# CONFIG_IWLWIFI_LEDS is not set 563
564#
565# Enable WiMAX (Networking options) to see the WiMAX drivers
566#
542# CONFIG_WAN is not set 567# CONFIG_WAN is not set
543CONFIG_PPP=m 568CONFIG_PPP=m
544# CONFIG_PPP_MULTILINK is not set 569# CONFIG_PPP_MULTILINK is not set
@@ -596,7 +621,6 @@ CONFIG_MOUSE_PS2=m
596CONFIG_MOUSE_PS2_ALPS=y 621CONFIG_MOUSE_PS2_ALPS=y
597CONFIG_MOUSE_PS2_LOGIPS2PP=y 622CONFIG_MOUSE_PS2_LOGIPS2PP=y
598CONFIG_MOUSE_PS2_SYNAPTICS=y 623CONFIG_MOUSE_PS2_SYNAPTICS=y
599CONFIG_MOUSE_PS2_LIFEBOOK=y
600CONFIG_MOUSE_PS2_TRACKPOINT=y 624CONFIG_MOUSE_PS2_TRACKPOINT=y
601# CONFIG_MOUSE_PS2_ELANTECH is not set 625# CONFIG_MOUSE_PS2_ELANTECH is not set
602# CONFIG_MOUSE_PS2_TOUCHKIT is not set 626# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -636,6 +660,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
636# Non-8250 serial port support 660# Non-8250 serial port support
637# 661#
638CONFIG_UNIX98_PTYS=y 662CONFIG_UNIX98_PTYS=y
663# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
639CONFIG_LEGACY_PTYS=y 664CONFIG_LEGACY_PTYS=y
640CONFIG_LEGACY_PTY_COUNT=256 665CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_IPMI_HANDLER is not set 666# CONFIG_IPMI_HANDLER is not set
@@ -718,6 +743,7 @@ CONFIG_FB_APOLLO=y
718# CONFIG_FB_VIRTUAL is not set 743# CONFIG_FB_VIRTUAL is not set
719# CONFIG_FB_METRONOME is not set 744# CONFIG_FB_METRONOME is not set
720# CONFIG_FB_MB862XX is not set 745# CONFIG_FB_MB862XX is not set
746# CONFIG_FB_BROADSHEET is not set
721# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 747# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
722 748
723# 749#
@@ -749,7 +775,6 @@ CONFIG_HIDRAW=y
749# 775#
750# Special HID drivers 776# Special HID drivers
751# 777#
752CONFIG_HID_COMPAT=y
753# CONFIG_USB_SUPPORT is not set 778# CONFIG_USB_SUPPORT is not set
754# CONFIG_MMC is not set 779# CONFIG_MMC is not set
755# CONFIG_MEMSTICK is not set 780# CONFIG_MEMSTICK is not set
@@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y
757# CONFIG_ACCESSIBILITY is not set 782# CONFIG_ACCESSIBILITY is not set
758# CONFIG_RTC_CLASS is not set 783# CONFIG_RTC_CLASS is not set
759# CONFIG_DMADEVICES is not set 784# CONFIG_DMADEVICES is not set
785# CONFIG_AUXDISPLAY is not set
760# CONFIG_UIO is not set 786# CONFIG_UIO is not set
761# CONFIG_STAGING is not set 787# CONFIG_STAGING is not set
762CONFIG_STAGING_EXCLUDE_BUILD=y
763 788
764# 789#
765# Character devices 790# Character devices
@@ -774,6 +799,7 @@ CONFIG_EXT2_FS=y
774# CONFIG_EXT2_FS_XATTR is not set 799# CONFIG_EXT2_FS_XATTR is not set
775# CONFIG_EXT2_FS_XIP is not set 800# CONFIG_EXT2_FS_XIP is not set
776CONFIG_EXT3_FS=y 801CONFIG_EXT3_FS=y
802# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
777# CONFIG_EXT3_FS_XATTR is not set 803# CONFIG_EXT3_FS_XATTR is not set
778# CONFIG_EXT4_FS is not set 804# CONFIG_EXT4_FS is not set
779CONFIG_JBD=y 805CONFIG_JBD=y
@@ -800,13 +826,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
800# CONFIG_OCFS2_FS_STATS is not set 826# CONFIG_OCFS2_FS_STATS is not set
801# CONFIG_OCFS2_DEBUG_MASKLOG is not set 827# CONFIG_OCFS2_DEBUG_MASKLOG is not set
802# CONFIG_OCFS2_DEBUG_FS is not set 828# CONFIG_OCFS2_DEBUG_FS is not set
803# CONFIG_OCFS2_COMPAT_JBD is not set 829# CONFIG_OCFS2_FS_POSIX_ACL is not set
830# CONFIG_BTRFS_FS is not set
804CONFIG_DNOTIFY=y 831CONFIG_DNOTIFY=y
805CONFIG_INOTIFY=y 832CONFIG_INOTIFY=y
806CONFIG_INOTIFY_USER=y 833CONFIG_INOTIFY_USER=y
807CONFIG_QUOTA=y 834CONFIG_QUOTA=y
808CONFIG_QUOTA_NETLINK_INTERFACE=y 835CONFIG_QUOTA_NETLINK_INTERFACE=y
809# CONFIG_PRINT_QUOTA_WARNING is not set 836# CONFIG_PRINT_QUOTA_WARNING is not set
837CONFIG_QUOTA_TREE=m
810# CONFIG_QFMT_V1 is not set 838# CONFIG_QFMT_V1 is not set
811# CONFIG_QFMT_V2 is not set 839# CONFIG_QFMT_V2 is not set
812CONFIG_QUOTACTL=y 840CONFIG_QUOTACTL=y
@@ -815,6 +843,11 @@ CONFIG_AUTOFS4_FS=m
815CONFIG_FUSE_FS=m 843CONFIG_FUSE_FS=m
816 844
817# 845#
846# Caches
847#
848# CONFIG_FSCACHE is not set
849
850#
818# CD-ROM/DVD Filesystems 851# CD-ROM/DVD Filesystems
819# 852#
820CONFIG_ISO9660_FS=y 853CONFIG_ISO9660_FS=y
@@ -845,10 +878,7 @@ CONFIG_TMPFS=y
845# CONFIG_TMPFS_POSIX_ACL is not set 878# CONFIG_TMPFS_POSIX_ACL is not set
846# CONFIG_HUGETLB_PAGE is not set 879# CONFIG_HUGETLB_PAGE is not set
847CONFIG_CONFIGFS_FS=m 880CONFIG_CONFIGFS_FS=m
848 881CONFIG_MISC_FILESYSTEMS=y
849#
850# Miscellaneous filesystems
851#
852# CONFIG_ADFS_FS is not set 882# CONFIG_ADFS_FS is not set
853CONFIG_AFFS_FS=m 883CONFIG_AFFS_FS=m
854CONFIG_HFS_FS=m 884CONFIG_HFS_FS=m
@@ -857,6 +887,9 @@ CONFIG_HFSPLUS_FS=m
857# CONFIG_BFS_FS is not set 887# CONFIG_BFS_FS is not set
858# CONFIG_EFS_FS is not set 888# CONFIG_EFS_FS is not set
859CONFIG_CRAMFS=m 889CONFIG_CRAMFS=m
890CONFIG_SQUASHFS=m
891# CONFIG_SQUASHFS_EMBEDDED is not set
892CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
860# CONFIG_VXFS_FS is not set 893# CONFIG_VXFS_FS is not set
861CONFIG_MINIX_FS=y 894CONFIG_MINIX_FS=y
862# CONFIG_OMFS_FS is not set 895# CONFIG_OMFS_FS is not set
@@ -867,6 +900,7 @@ CONFIG_SYSV_FS=m
867CONFIG_UFS_FS=m 900CONFIG_UFS_FS=m
868# CONFIG_UFS_FS_WRITE is not set 901# CONFIG_UFS_FS_WRITE is not set
869# CONFIG_UFS_DEBUG is not set 902# CONFIG_UFS_DEBUG is not set
903# CONFIG_NILFS2_FS is not set
870CONFIG_NETWORK_FILESYSTEMS=y 904CONFIG_NETWORK_FILESYSTEMS=y
871CONFIG_NFS_FS=y 905CONFIG_NFS_FS=y
872CONFIG_NFS_V3=y 906CONFIG_NFS_V3=y
@@ -883,7 +917,6 @@ CONFIG_EXPORTFS=m
883CONFIG_NFS_COMMON=y 917CONFIG_NFS_COMMON=y
884CONFIG_SUNRPC=y 918CONFIG_SUNRPC=y
885CONFIG_SUNRPC_GSS=y 919CONFIG_SUNRPC_GSS=y
886# CONFIG_SUNRPC_REGISTER_V4 is not set
887CONFIG_RPCSEC_GSS_KRB5=y 920CONFIG_RPCSEC_GSS_KRB5=y
888# CONFIG_RPCSEC_GSS_SPKM3 is not set 921# CONFIG_RPCSEC_GSS_SPKM3 is not set
889CONFIG_SMB_FS=m 922CONFIG_SMB_FS=m
@@ -958,11 +991,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
958CONFIG_DEBUG_MEMORY_INIT=y 991CONFIG_DEBUG_MEMORY_INIT=y
959# CONFIG_RCU_CPU_STALL_DETECTOR is not set 992# CONFIG_RCU_CPU_STALL_DETECTOR is not set
960CONFIG_SYSCTL_SYSCALL_CHECK=y 993CONFIG_SYSCTL_SYSCALL_CHECK=y
961
962#
963# Tracers
964#
965# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
966# CONFIG_SAMPLES is not set 994# CONFIG_SAMPLES is not set
967 995
968# 996#
@@ -983,13 +1011,21 @@ CONFIG_CRYPTO=y
983# 1011#
984# CONFIG_CRYPTO_FIPS is not set 1012# CONFIG_CRYPTO_FIPS is not set
985CONFIG_CRYPTO_ALGAPI=y 1013CONFIG_CRYPTO_ALGAPI=y
986CONFIG_CRYPTO_AEAD=y 1014CONFIG_CRYPTO_ALGAPI2=y
1015CONFIG_CRYPTO_AEAD=m
1016CONFIG_CRYPTO_AEAD2=y
987CONFIG_CRYPTO_BLKCIPHER=y 1017CONFIG_CRYPTO_BLKCIPHER=y
1018CONFIG_CRYPTO_BLKCIPHER2=y
988CONFIG_CRYPTO_HASH=y 1019CONFIG_CRYPTO_HASH=y
989CONFIG_CRYPTO_RNG=y 1020CONFIG_CRYPTO_HASH2=y
1021CONFIG_CRYPTO_RNG=m
1022CONFIG_CRYPTO_RNG2=y
1023CONFIG_CRYPTO_PCOMP=y
990CONFIG_CRYPTO_MANAGER=y 1024CONFIG_CRYPTO_MANAGER=y
1025CONFIG_CRYPTO_MANAGER2=y
991CONFIG_CRYPTO_GF128MUL=m 1026CONFIG_CRYPTO_GF128MUL=m
992CONFIG_CRYPTO_NULL=m 1027CONFIG_CRYPTO_NULL=m
1028CONFIG_CRYPTO_WORKQUEUE=y
993CONFIG_CRYPTO_CRYPTD=m 1029CONFIG_CRYPTO_CRYPTD=m
994CONFIG_CRYPTO_AUTHENC=m 1030CONFIG_CRYPTO_AUTHENC=m
995CONFIG_CRYPTO_TEST=m 1031CONFIG_CRYPTO_TEST=m
@@ -1059,6 +1095,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1059# Compression 1095# Compression
1060# 1096#
1061CONFIG_CRYPTO_DEFLATE=m 1097CONFIG_CRYPTO_DEFLATE=m
1098CONFIG_CRYPTO_ZLIB=m
1062CONFIG_CRYPTO_LZO=m 1099CONFIG_CRYPTO_LZO=m
1063 1100
1064# 1101#
@@ -1066,11 +1103,13 @@ CONFIG_CRYPTO_LZO=m
1066# 1103#
1067# CONFIG_CRYPTO_ANSI_CPRNG is not set 1104# CONFIG_CRYPTO_ANSI_CPRNG is not set
1068# CONFIG_CRYPTO_HW is not set 1105# CONFIG_CRYPTO_HW is not set
1106# CONFIG_BINARY_PRINTF is not set
1069 1107
1070# 1108#
1071# Library routines 1109# Library routines
1072# 1110#
1073CONFIG_BITREVERSE=y 1111CONFIG_BITREVERSE=y
1112CONFIG_GENERIC_FIND_LAST_BIT=y
1074CONFIG_CRC_CCITT=m 1113CONFIG_CRC_CCITT=m
1075CONFIG_CRC16=m 1114CONFIG_CRC16=m
1076CONFIG_CRC_T10DIF=y 1115CONFIG_CRC_T10DIF=y
@@ -1082,10 +1121,13 @@ CONFIG_ZLIB_INFLATE=y
1082CONFIG_ZLIB_DEFLATE=m 1121CONFIG_ZLIB_DEFLATE=m
1083CONFIG_LZO_COMPRESS=m 1122CONFIG_LZO_COMPRESS=m
1084CONFIG_LZO_DECOMPRESS=m 1123CONFIG_LZO_DECOMPRESS=m
1124CONFIG_DECOMPRESS_GZIP=y
1125CONFIG_DECOMPRESS_BZIP2=y
1126CONFIG_DECOMPRESS_LZMA=y
1085CONFIG_TEXTSEARCH=y 1127CONFIG_TEXTSEARCH=y
1086CONFIG_TEXTSEARCH_KMP=m 1128CONFIG_TEXTSEARCH_KMP=m
1087CONFIG_TEXTSEARCH_BM=m 1129CONFIG_TEXTSEARCH_BM=m
1088CONFIG_TEXTSEARCH_FSM=m 1130CONFIG_TEXTSEARCH_FSM=m
1089CONFIG_PLIST=y
1090CONFIG_HAS_IOMEM=y 1131CONFIG_HAS_IOMEM=y
1091CONFIG_HAS_DMA=y 1132CONFIG_HAS_DMA=y
1133CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index a594a1d47b62..d92a90e03ecb 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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:44 2008 4# Wed Apr 22 20:47:56 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -180,7 +192,10 @@ CONFIG_INET=y
180# CONFIG_IP_MULTICAST is not set 192# CONFIG_IP_MULTICAST is not set
181# CONFIG_IP_ADVANCED_ROUTER is not set 193# CONFIG_IP_ADVANCED_ROUTER is not set
182CONFIG_IP_FIB_HASH=y 194CONFIG_IP_FIB_HASH=y
183# CONFIG_IP_PNP is not set 195CONFIG_IP_PNP=y
196# CONFIG_IP_PNP_DHCP is not set
197# CONFIG_IP_PNP_BOOTP is not set
198# CONFIG_IP_PNP_RARP is not set
184CONFIG_NET_IPIP=m 199CONFIG_NET_IPIP=m
185CONFIG_NET_IPGRE=m 200CONFIG_NET_IPGRE=m
186# CONFIG_ARPD is not set 201# CONFIG_ARPD is not set
@@ -254,6 +269,7 @@ CONFIG_NETFILTER_XTABLES=m
254CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 269CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
255CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 270CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
256CONFIG_NETFILTER_XT_TARGET_DSCP=m 271CONFIG_NETFILTER_XT_TARGET_DSCP=m
272CONFIG_NETFILTER_XT_TARGET_HL=m
257CONFIG_NETFILTER_XT_TARGET_MARK=m 273CONFIG_NETFILTER_XT_TARGET_MARK=m
258CONFIG_NETFILTER_XT_TARGET_NFLOG=m 274CONFIG_NETFILTER_XT_TARGET_NFLOG=m
259CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 275CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -262,6 +278,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
262CONFIG_NETFILTER_XT_TARGET_TRACE=m 278CONFIG_NETFILTER_XT_TARGET_TRACE=m
263CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 279CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
264CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 280CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
281CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
265CONFIG_NETFILTER_XT_MATCH_COMMENT=m 282CONFIG_NETFILTER_XT_MATCH_COMMENT=m
266CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 283CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
267CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 284CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -272,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
272CONFIG_NETFILTER_XT_MATCH_ESP=m 289CONFIG_NETFILTER_XT_MATCH_ESP=m
273CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 290CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
274CONFIG_NETFILTER_XT_MATCH_HELPER=m 291CONFIG_NETFILTER_XT_MATCH_HELPER=m
292CONFIG_NETFILTER_XT_MATCH_HL=m
275CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 293CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
276CONFIG_NETFILTER_XT_MATCH_LENGTH=m 294CONFIG_NETFILTER_XT_MATCH_LENGTH=m
277CONFIG_NETFILTER_XT_MATCH_LIMIT=m 295CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -350,25 +368,20 @@ CONFIG_IP6_NF_MATCH_HL=m
350CONFIG_IP6_NF_MATCH_IPV6HEADER=m 368CONFIG_IP6_NF_MATCH_IPV6HEADER=m
351CONFIG_IP6_NF_MATCH_MH=m 369CONFIG_IP6_NF_MATCH_MH=m
352CONFIG_IP6_NF_MATCH_RT=m 370CONFIG_IP6_NF_MATCH_RT=m
371CONFIG_IP6_NF_TARGET_HL=m
353CONFIG_IP6_NF_TARGET_LOG=m 372CONFIG_IP6_NF_TARGET_LOG=m
354CONFIG_IP6_NF_FILTER=m 373CONFIG_IP6_NF_FILTER=m
355CONFIG_IP6_NF_TARGET_REJECT=m 374CONFIG_IP6_NF_TARGET_REJECT=m
356CONFIG_IP6_NF_MANGLE=m 375CONFIG_IP6_NF_MANGLE=m
357CONFIG_IP6_NF_TARGET_HL=m
358CONFIG_IP6_NF_RAW=m 376CONFIG_IP6_NF_RAW=m
359CONFIG_IP_DCCP=m 377CONFIG_IP_DCCP=m
360CONFIG_INET_DCCP_DIAG=m 378CONFIG_INET_DCCP_DIAG=m
361CONFIG_IP_DCCP_ACKVEC=y
362 379
363# 380#
364# DCCP CCIDs Configuration (EXPERIMENTAL) 381# DCCP CCIDs Configuration (EXPERIMENTAL)
365# 382#
366CONFIG_IP_DCCP_CCID2=m
367# CONFIG_IP_DCCP_CCID2_DEBUG is not set 383# CONFIG_IP_DCCP_CCID2_DEBUG is not set
368CONFIG_IP_DCCP_CCID3=m 384# CONFIG_IP_DCCP_CCID3 is not set
369# CONFIG_IP_DCCP_CCID3_DEBUG is not set
370CONFIG_IP_DCCP_CCID3_RTO=100
371CONFIG_IP_DCCP_TFRC_LIB=m
372CONFIG_IP_SCTP=m 385CONFIG_IP_SCTP=m
373# CONFIG_SCTP_DBG_MSG is not set 386# CONFIG_SCTP_DBG_MSG is not set
374# CONFIG_SCTP_DBG_OBJCNT is not set 387# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -390,8 +403,10 @@ CONFIG_ATALK=m
390# CONFIG_LAPB is not set 403# CONFIG_LAPB is not set
391# CONFIG_ECONET is not set 404# CONFIG_ECONET is not set
392# CONFIG_WAN_ROUTER is not set 405# CONFIG_WAN_ROUTER is not set
406# CONFIG_PHONET is not set
393# CONFIG_NET_SCHED is not set 407# CONFIG_NET_SCHED is not set
394CONFIG_NET_CLS_ROUTE=y 408CONFIG_NET_CLS_ROUTE=y
409# CONFIG_DCB is not set
395 410
396# 411#
397# Network testing 412# Network testing
@@ -402,8 +417,8 @@ CONFIG_NET_CLS_ROUTE=y
402# CONFIG_IRDA is not set 417# CONFIG_IRDA is not set
403# CONFIG_BT is not set 418# CONFIG_BT is not set
404# CONFIG_AF_RXRPC is not set 419# CONFIG_AF_RXRPC is not set
405# CONFIG_PHONET is not set
406# CONFIG_WIRELESS is not set 420# CONFIG_WIRELESS is not set
421# CONFIG_WIMAX is not set
407# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
408# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
409 424
@@ -445,15 +460,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
445CONFIG_ATA_OVER_ETH=m 460CONFIG_ATA_OVER_ETH=m
446# CONFIG_BLK_DEV_HD is not set 461# CONFIG_BLK_DEV_HD is not set
447CONFIG_MISC_DEVICES=y 462CONFIG_MISC_DEVICES=y
448# CONFIG_EEPROM_93CX6 is not set
449# CONFIG_ENCLOSURE_SERVICES is not set 463# CONFIG_ENCLOSURE_SERVICES is not set
450# CONFIG_C2PORT is not set 464# CONFIG_C2PORT is not set
465
466#
467# EEPROM support
468#
469# CONFIG_EEPROM_93CX6 is not set
451CONFIG_HAVE_IDE=y 470CONFIG_HAVE_IDE=y
452CONFIG_IDE=y 471CONFIG_IDE=y
453 472
454# 473#
455# Please see Documentation/ide/ide.txt for help/info on IDE drives 474# Please see Documentation/ide/ide.txt for help/info on IDE drives
456# 475#
476CONFIG_IDE_ATAPI=y
457# CONFIG_BLK_DEV_IDE_SATA is not set 477# CONFIG_BLK_DEV_IDE_SATA is not set
458CONFIG_IDE_GD=y 478CONFIG_IDE_GD=y
459CONFIG_IDE_GD_ATA=y 479CONFIG_IDE_GD_ATA=y
@@ -461,7 +481,6 @@ CONFIG_IDE_GD_ATA=y
461CONFIG_BLK_DEV_IDECD=y 481CONFIG_BLK_DEV_IDECD=y
462CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 482CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
463# CONFIG_BLK_DEV_IDETAPE is not set 483# CONFIG_BLK_DEV_IDETAPE is not set
464# CONFIG_BLK_DEV_IDESCSI is not set
465# CONFIG_IDE_TASK_IOCTL is not set 484# CONFIG_IDE_TASK_IOCTL is not set
466CONFIG_IDE_PROC_FS=y 485CONFIG_IDE_PROC_FS=y
467 486
@@ -516,11 +535,14 @@ CONFIG_SCSI_SRP_ATTRS=m
516CONFIG_SCSI_SRP_TGT_ATTRS=y 535CONFIG_SCSI_SRP_TGT_ATTRS=y
517CONFIG_SCSI_LOWLEVEL=y 536CONFIG_SCSI_LOWLEVEL=y
518CONFIG_ISCSI_TCP=m 537CONFIG_ISCSI_TCP=m
538# CONFIG_LIBFC is not set
539# CONFIG_LIBFCOE is not set
519# CONFIG_SCSI_DEBUG is not set 540# CONFIG_SCSI_DEBUG is not set
520CONFIG_ATARI_SCSI=y 541CONFIG_ATARI_SCSI=y
521# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set 542# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
522# CONFIG_ATARI_SCSI_RESET_BOOT is not set 543# CONFIG_ATARI_SCSI_RESET_BOOT is not set
523# CONFIG_SCSI_DH is not set 544# CONFIG_SCSI_DH is not set
545# CONFIG_SCSI_OSD_INITIATOR is not set
524CONFIG_MD=y 546CONFIG_MD=y
525CONFIG_BLK_DEV_MD=m 547CONFIG_BLK_DEV_MD=m
526CONFIG_MD_LINEAR=m 548CONFIG_MD_LINEAR=m
@@ -528,7 +550,7 @@ CONFIG_MD_RAID0=m
528CONFIG_MD_RAID1=m 550CONFIG_MD_RAID1=m
529# CONFIG_MD_RAID10 is not set 551# CONFIG_MD_RAID10 is not set
530CONFIG_MD_RAID456=m 552CONFIG_MD_RAID456=m
531CONFIG_MD_RAID5_RESHAPE=y 553CONFIG_MD_RAID6_PQ=m
532# CONFIG_MD_MULTIPATH is not set 554# CONFIG_MD_MULTIPATH is not set
533# CONFIG_MD_FAULTY is not set 555# CONFIG_MD_FAULTY is not set
534CONFIG_BLK_DEV_DM=m 556CONFIG_BLK_DEV_DM=m
@@ -541,6 +563,7 @@ CONFIG_DM_MULTIPATH=m
541# CONFIG_DM_DELAY is not set 563# CONFIG_DM_DELAY is not set
542CONFIG_DM_UEVENT=y 564CONFIG_DM_UEVENT=y
543CONFIG_NETDEVICES=y 565CONFIG_NETDEVICES=y
566CONFIG_COMPAT_NET_DEV_OPS=y
544CONFIG_DUMMY=m 567CONFIG_DUMMY=m
545# CONFIG_BONDING is not set 568# CONFIG_BONDING is not set
546CONFIG_MACVLAN=m 569CONFIG_MACVLAN=m
@@ -550,7 +573,9 @@ CONFIG_VETH=m
550# CONFIG_PHYLIB is not set 573# CONFIG_PHYLIB is not set
551CONFIG_NET_ETHERNET=y 574CONFIG_NET_ETHERNET=y
552CONFIG_MII=y 575CONFIG_MII=y
553CONFIG_ATARILANCE=m 576CONFIG_ATARILANCE=y
577# CONFIG_ETHOC is not set
578# CONFIG_DNET is not set
554# CONFIG_IBM_NEW_EMAC_ZMII is not set 579# CONFIG_IBM_NEW_EMAC_ZMII is not set
555# CONFIG_IBM_NEW_EMAC_RGMII is not set 580# CONFIG_IBM_NEW_EMAC_RGMII is not set
556# CONFIG_IBM_NEW_EMAC_TAH is not set 581# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -568,7 +593,10 @@ CONFIG_ATARILANCE=m
568# 593#
569# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
570# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
571# CONFIG_IWLWIFI_LEDS is not set 596
597#
598# Enable WiMAX (Networking options) to see the WiMAX drivers
599#
572# CONFIG_WAN is not set 600# CONFIG_WAN is not set
573# CONFIG_PLIP is not set 601# CONFIG_PLIP is not set
574CONFIG_PPP=m 602CONFIG_PPP=m
@@ -625,11 +653,10 @@ CONFIG_INPUT_KEYBOARD=y
625CONFIG_ATARI_KBD_CORE=y 653CONFIG_ATARI_KBD_CORE=y
626CONFIG_KEYBOARD_ATARI=y 654CONFIG_KEYBOARD_ATARI=y
627CONFIG_INPUT_MOUSE=y 655CONFIG_INPUT_MOUSE=y
628CONFIG_MOUSE_PS2=y 656CONFIG_MOUSE_PS2=m
629CONFIG_MOUSE_PS2_ALPS=y 657CONFIG_MOUSE_PS2_ALPS=y
630CONFIG_MOUSE_PS2_LOGIPS2PP=y 658CONFIG_MOUSE_PS2_LOGIPS2PP=y
631CONFIG_MOUSE_PS2_SYNAPTICS=y 659CONFIG_MOUSE_PS2_SYNAPTICS=y
632CONFIG_MOUSE_PS2_LIFEBOOK=y
633CONFIG_MOUSE_PS2_TRACKPOINT=y 660CONFIG_MOUSE_PS2_TRACKPOINT=y
634# CONFIG_MOUSE_PS2_ELANTECH is not set 661# CONFIG_MOUSE_PS2_ELANTECH is not set
635# CONFIG_MOUSE_PS2_TOUCHKIT is not set 662# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -649,7 +676,7 @@ CONFIG_INPUT_M68K_BEEP=m
649CONFIG_SERIO=y 676CONFIG_SERIO=y
650# CONFIG_SERIO_SERPORT is not set 677# CONFIG_SERIO_SERPORT is not set
651# CONFIG_SERIO_PARKBD is not set 678# CONFIG_SERIO_PARKBD is not set
652CONFIG_SERIO_LIBPS2=y 679CONFIG_SERIO_LIBPS2=m
653# CONFIG_SERIO_RAW is not set 680# CONFIG_SERIO_RAW is not set
654# CONFIG_GAMEPORT is not set 681# CONFIG_GAMEPORT is not set
655 682
@@ -673,6 +700,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
673# Non-8250 serial port support 700# Non-8250 serial port support
674# 701#
675CONFIG_UNIX98_PTYS=y 702CONFIG_UNIX98_PTYS=y
703# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
676CONFIG_LEGACY_PTYS=y 704CONFIG_LEGACY_PTYS=y
677CONFIG_LEGACY_PTY_COUNT=256 705CONFIG_LEGACY_PTY_COUNT=256
678CONFIG_PRINTER=m 706CONFIG_PRINTER=m
@@ -760,6 +788,7 @@ CONFIG_FB_ATARI=y
760# CONFIG_FB_VIRTUAL is not set 788# CONFIG_FB_VIRTUAL is not set
761# CONFIG_FB_METRONOME is not set 789# CONFIG_FB_METRONOME is not set
762# CONFIG_FB_MB862XX is not set 790# CONFIG_FB_MB862XX is not set
791# CONFIG_FB_BROADSHEET is not set
763# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 792# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
764 793
765# 794#
@@ -794,7 +823,6 @@ CONFIG_HIDRAW=y
794# 823#
795# Special HID drivers 824# Special HID drivers
796# 825#
797CONFIG_HID_COMPAT=y
798# CONFIG_USB_SUPPORT is not set 826# CONFIG_USB_SUPPORT is not set
799# CONFIG_MMC is not set 827# CONFIG_MMC is not set
800# CONFIG_MEMSTICK is not set 828# CONFIG_MEMSTICK is not set
@@ -805,14 +833,14 @@ CONFIG_HID_COMPAT=y
805# CONFIG_AUXDISPLAY is not set 833# CONFIG_AUXDISPLAY is not set
806# CONFIG_UIO is not set 834# CONFIG_UIO is not set
807# CONFIG_STAGING is not set 835# CONFIG_STAGING is not set
808CONFIG_STAGING_EXCLUDE_BUILD=y
809 836
810# 837#
811# Character devices 838# Character devices
812# 839#
813CONFIG_ATARI_MFPSER=m 840CONFIG_ATARI_MFPSER=y
814CONFIG_ATARI_MIDI=m 841CONFIG_ATARI_MIDI=y
815CONFIG_ATARI_DSP56K=m 842CONFIG_ATARI_DSP56K=m
843CONFIG_SERIAL_CONSOLE=y
816 844
817# 845#
818# File systems 846# File systems
@@ -821,6 +849,7 @@ CONFIG_EXT2_FS=y
821# CONFIG_EXT2_FS_XATTR is not set 849# CONFIG_EXT2_FS_XATTR is not set
822# CONFIG_EXT2_FS_XIP is not set 850# CONFIG_EXT2_FS_XIP is not set
823CONFIG_EXT3_FS=y 851CONFIG_EXT3_FS=y
852# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
824# CONFIG_EXT3_FS_XATTR is not set 853# CONFIG_EXT3_FS_XATTR is not set
825# CONFIG_EXT4_FS is not set 854# CONFIG_EXT4_FS is not set
826CONFIG_JBD=y 855CONFIG_JBD=y
@@ -847,13 +876,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
847# CONFIG_OCFS2_FS_STATS is not set 876# CONFIG_OCFS2_FS_STATS is not set
848# CONFIG_OCFS2_DEBUG_MASKLOG is not set 877# CONFIG_OCFS2_DEBUG_MASKLOG is not set
849# CONFIG_OCFS2_DEBUG_FS is not set 878# CONFIG_OCFS2_DEBUG_FS is not set
850# CONFIG_OCFS2_COMPAT_JBD is not set 879# CONFIG_OCFS2_FS_POSIX_ACL is not set
880# CONFIG_BTRFS_FS is not set
851CONFIG_DNOTIFY=y 881CONFIG_DNOTIFY=y
852CONFIG_INOTIFY=y 882CONFIG_INOTIFY=y
853CONFIG_INOTIFY_USER=y 883CONFIG_INOTIFY_USER=y
854CONFIG_QUOTA=y 884CONFIG_QUOTA=y
855CONFIG_QUOTA_NETLINK_INTERFACE=y 885CONFIG_QUOTA_NETLINK_INTERFACE=y
856# CONFIG_PRINT_QUOTA_WARNING is not set 886# CONFIG_PRINT_QUOTA_WARNING is not set
887CONFIG_QUOTA_TREE=m
857# CONFIG_QFMT_V1 is not set 888# CONFIG_QFMT_V1 is not set
858# CONFIG_QFMT_V2 is not set 889# CONFIG_QFMT_V2 is not set
859CONFIG_QUOTACTL=y 890CONFIG_QUOTACTL=y
@@ -862,6 +893,11 @@ CONFIG_AUTOFS4_FS=m
862CONFIG_FUSE_FS=m 893CONFIG_FUSE_FS=m
863 894
864# 895#
896# Caches
897#
898# CONFIG_FSCACHE is not set
899
900#
865# CD-ROM/DVD Filesystems 901# CD-ROM/DVD Filesystems
866# 902#
867CONFIG_ISO9660_FS=y 903CONFIG_ISO9660_FS=y
@@ -892,10 +928,7 @@ CONFIG_TMPFS=y
892# CONFIG_TMPFS_POSIX_ACL is not set 928# CONFIG_TMPFS_POSIX_ACL is not set
893# CONFIG_HUGETLB_PAGE is not set 929# CONFIG_HUGETLB_PAGE is not set
894CONFIG_CONFIGFS_FS=m 930CONFIG_CONFIGFS_FS=m
895 931CONFIG_MISC_FILESYSTEMS=y
896#
897# Miscellaneous filesystems
898#
899# CONFIG_ADFS_FS is not set 932# CONFIG_ADFS_FS is not set
900CONFIG_AFFS_FS=m 933CONFIG_AFFS_FS=m
901CONFIG_HFS_FS=m 934CONFIG_HFS_FS=m
@@ -904,6 +937,9 @@ CONFIG_HFSPLUS_FS=m
904# CONFIG_BFS_FS is not set 937# CONFIG_BFS_FS is not set
905# CONFIG_EFS_FS is not set 938# CONFIG_EFS_FS is not set
906CONFIG_CRAMFS=m 939CONFIG_CRAMFS=m
940CONFIG_SQUASHFS=m
941# CONFIG_SQUASHFS_EMBEDDED is not set
942CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
907# CONFIG_VXFS_FS is not set 943# CONFIG_VXFS_FS is not set
908CONFIG_MINIX_FS=y 944CONFIG_MINIX_FS=y
909# CONFIG_OMFS_FS is not set 945# CONFIG_OMFS_FS is not set
@@ -914,22 +950,24 @@ CONFIG_SYSV_FS=m
914CONFIG_UFS_FS=m 950CONFIG_UFS_FS=m
915# CONFIG_UFS_FS_WRITE is not set 951# CONFIG_UFS_FS_WRITE is not set
916# CONFIG_UFS_DEBUG is not set 952# CONFIG_UFS_DEBUG is not set
953# CONFIG_NILFS2_FS is not set
917CONFIG_NETWORK_FILESYSTEMS=y 954CONFIG_NETWORK_FILESYSTEMS=y
918CONFIG_NFS_FS=m 955CONFIG_NFS_FS=y
919CONFIG_NFS_V3=y 956CONFIG_NFS_V3=y
920# CONFIG_NFS_V3_ACL is not set 957# CONFIG_NFS_V3_ACL is not set
921# CONFIG_NFS_V4 is not set 958CONFIG_NFS_V4=y
959# CONFIG_ROOT_NFS is not set
922CONFIG_NFSD=m 960CONFIG_NFSD=m
923CONFIG_NFSD_V3=y 961CONFIG_NFSD_V3=y
924# CONFIG_NFSD_V3_ACL is not set 962# CONFIG_NFSD_V3_ACL is not set
925# CONFIG_NFSD_V4 is not set 963# CONFIG_NFSD_V4 is not set
926CONFIG_LOCKD=m 964CONFIG_LOCKD=y
927CONFIG_LOCKD_V4=y 965CONFIG_LOCKD_V4=y
928CONFIG_EXPORTFS=m 966CONFIG_EXPORTFS=m
929CONFIG_NFS_COMMON=y 967CONFIG_NFS_COMMON=y
930CONFIG_SUNRPC=m 968CONFIG_SUNRPC=y
931# CONFIG_SUNRPC_REGISTER_V4 is not set 969CONFIG_SUNRPC_GSS=y
932# CONFIG_RPCSEC_GSS_KRB5 is not set 970CONFIG_RPCSEC_GSS_KRB5=y
933# CONFIG_RPCSEC_GSS_SPKM3 is not set 971# CONFIG_RPCSEC_GSS_SPKM3 is not set
934CONFIG_SMB_FS=m 972CONFIG_SMB_FS=m
935CONFIG_SMB_NLS_DEFAULT=y 973CONFIG_SMB_NLS_DEFAULT=y
@@ -1004,11 +1042,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1004CONFIG_DEBUG_MEMORY_INIT=y 1042CONFIG_DEBUG_MEMORY_INIT=y
1005# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1043# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1006CONFIG_SYSCTL_SYSCALL_CHECK=y 1044CONFIG_SYSCTL_SYSCALL_CHECK=y
1007
1008#
1009# Tracers
1010#
1011# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1012# CONFIG_SAMPLES is not set 1045# CONFIG_SAMPLES is not set
1013 1046
1014# 1047#
@@ -1029,13 +1062,21 @@ CONFIG_CRYPTO=y
1029# 1062#
1030# CONFIG_CRYPTO_FIPS is not set 1063# CONFIG_CRYPTO_FIPS is not set
1031CONFIG_CRYPTO_ALGAPI=y 1064CONFIG_CRYPTO_ALGAPI=y
1032CONFIG_CRYPTO_AEAD=y 1065CONFIG_CRYPTO_ALGAPI2=y
1066CONFIG_CRYPTO_AEAD=m
1067CONFIG_CRYPTO_AEAD2=y
1033CONFIG_CRYPTO_BLKCIPHER=y 1068CONFIG_CRYPTO_BLKCIPHER=y
1069CONFIG_CRYPTO_BLKCIPHER2=y
1034CONFIG_CRYPTO_HASH=y 1070CONFIG_CRYPTO_HASH=y
1035CONFIG_CRYPTO_RNG=y 1071CONFIG_CRYPTO_HASH2=y
1072CONFIG_CRYPTO_RNG=m
1073CONFIG_CRYPTO_RNG2=y
1074CONFIG_CRYPTO_PCOMP=y
1036CONFIG_CRYPTO_MANAGER=y 1075CONFIG_CRYPTO_MANAGER=y
1076CONFIG_CRYPTO_MANAGER2=y
1037CONFIG_CRYPTO_GF128MUL=m 1077CONFIG_CRYPTO_GF128MUL=m
1038CONFIG_CRYPTO_NULL=m 1078CONFIG_CRYPTO_NULL=m
1079CONFIG_CRYPTO_WORKQUEUE=y
1039CONFIG_CRYPTO_CRYPTD=m 1080CONFIG_CRYPTO_CRYPTD=m
1040CONFIG_CRYPTO_AUTHENC=m 1081CONFIG_CRYPTO_AUTHENC=m
1041CONFIG_CRYPTO_TEST=m 1082CONFIG_CRYPTO_TEST=m
@@ -1050,7 +1091,7 @@ CONFIG_CRYPTO_SEQIV=m
1050# 1091#
1051# Block modes 1092# Block modes
1052# 1093#
1053CONFIG_CRYPTO_CBC=m 1094CONFIG_CRYPTO_CBC=y
1054CONFIG_CRYPTO_CTR=m 1095CONFIG_CRYPTO_CTR=m
1055CONFIG_CRYPTO_CTS=m 1096CONFIG_CRYPTO_CTS=m
1056CONFIG_CRYPTO_ECB=m 1097CONFIG_CRYPTO_ECB=m
@@ -1069,7 +1110,7 @@ CONFIG_CRYPTO_XCBC=m
1069# 1110#
1070CONFIG_CRYPTO_CRC32C=m 1111CONFIG_CRYPTO_CRC32C=m
1071CONFIG_CRYPTO_MD4=m 1112CONFIG_CRYPTO_MD4=m
1072CONFIG_CRYPTO_MD5=m 1113CONFIG_CRYPTO_MD5=y
1073CONFIG_CRYPTO_MICHAEL_MIC=m 1114CONFIG_CRYPTO_MICHAEL_MIC=m
1074CONFIG_CRYPTO_RMD128=m 1115CONFIG_CRYPTO_RMD128=m
1075CONFIG_CRYPTO_RMD160=m 1116CONFIG_CRYPTO_RMD160=m
@@ -1091,7 +1132,7 @@ CONFIG_CRYPTO_BLOWFISH=m
1091CONFIG_CRYPTO_CAMELLIA=m 1132CONFIG_CRYPTO_CAMELLIA=m
1092CONFIG_CRYPTO_CAST5=m 1133CONFIG_CRYPTO_CAST5=m
1093CONFIG_CRYPTO_CAST6=m 1134CONFIG_CRYPTO_CAST6=m
1094CONFIG_CRYPTO_DES=m 1135CONFIG_CRYPTO_DES=y
1095CONFIG_CRYPTO_FCRYPT=m 1136CONFIG_CRYPTO_FCRYPT=m
1096CONFIG_CRYPTO_KHAZAD=m 1137CONFIG_CRYPTO_KHAZAD=m
1097CONFIG_CRYPTO_SALSA20=m 1138CONFIG_CRYPTO_SALSA20=m
@@ -1105,6 +1146,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1105# Compression 1146# Compression
1106# 1147#
1107CONFIG_CRYPTO_DEFLATE=m 1148CONFIG_CRYPTO_DEFLATE=m
1149CONFIG_CRYPTO_ZLIB=m
1108CONFIG_CRYPTO_LZO=m 1150CONFIG_CRYPTO_LZO=m
1109 1151
1110# 1152#
@@ -1112,11 +1154,13 @@ CONFIG_CRYPTO_LZO=m
1112# 1154#
1113# CONFIG_CRYPTO_ANSI_CPRNG is not set 1155# CONFIG_CRYPTO_ANSI_CPRNG is not set
1114# CONFIG_CRYPTO_HW is not set 1156# CONFIG_CRYPTO_HW is not set
1157# CONFIG_BINARY_PRINTF is not set
1115 1158
1116# 1159#
1117# Library routines 1160# Library routines
1118# 1161#
1119CONFIG_BITREVERSE=y 1162CONFIG_BITREVERSE=y
1163CONFIG_GENERIC_FIND_LAST_BIT=y
1120CONFIG_CRC_CCITT=m 1164CONFIG_CRC_CCITT=m
1121CONFIG_CRC16=y 1165CONFIG_CRC16=y
1122CONFIG_CRC_T10DIF=y 1166CONFIG_CRC_T10DIF=y
@@ -1128,10 +1172,13 @@ CONFIG_ZLIB_INFLATE=y
1128CONFIG_ZLIB_DEFLATE=m 1172CONFIG_ZLIB_DEFLATE=m
1129CONFIG_LZO_COMPRESS=m 1173CONFIG_LZO_COMPRESS=m
1130CONFIG_LZO_DECOMPRESS=m 1174CONFIG_LZO_DECOMPRESS=m
1175CONFIG_DECOMPRESS_GZIP=y
1176CONFIG_DECOMPRESS_BZIP2=y
1177CONFIG_DECOMPRESS_LZMA=y
1131CONFIG_TEXTSEARCH=y 1178CONFIG_TEXTSEARCH=y
1132CONFIG_TEXTSEARCH_KMP=m 1179CONFIG_TEXTSEARCH_KMP=m
1133CONFIG_TEXTSEARCH_BM=m 1180CONFIG_TEXTSEARCH_BM=m
1134CONFIG_TEXTSEARCH_FSM=m 1181CONFIG_TEXTSEARCH_FSM=m
1135CONFIG_PLIST=y
1136CONFIG_HAS_IOMEM=y 1182CONFIG_HAS_IOMEM=y
1137CONFIG_HAS_DMA=y 1183CONFIG_HAS_DMA=y
1184CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index d3d9814a91de..6e6b1aa66682 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:45 2008 4# Wed Apr 22 20:47:59 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 154CONFIG_NEED_MULTIPLE_NODES=y
144CONFIG_PAGEFLAGS_EXTENDED=y 155CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set
147# CONFIG_PHYS_ADDR_T_64BIT is not set 157# CONFIG_PHYS_ADDR_T_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 158CONFIG_ZONE_DMA_FLAG=1
149CONFIG_BOUNCE=y 159CONFIG_BOUNCE=y
150CONFIG_VIRT_TO_BUS=y 160CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y 161CONFIG_UNEVICTABLE_LRU=y
162CONFIG_HAVE_MLOCK=y
163CONFIG_HAVE_MLOCKED_PAGE_BIT=y
152 164
153# 165#
154# General setup 166# General setup
@@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 270CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 271CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 272CONFIG_NETFILTER_XT_TARGET_DSCP=m
273CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 274CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 275CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 276CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 279CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 280CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 281CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
282CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 283CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 284CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 285CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 290CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 291CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 294CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 369CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 370CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 371CONFIG_IP6_NF_MATCH_RT=m
372CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 373CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 374CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 375CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 376CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 377CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 378CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 379CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 380
367# 381#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 382# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 383#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 384# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 385# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 386CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 387# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 388# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 459# CONFIG_C2PORT is not set
460
461#
462# EEPROM support
463#
464# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 465CONFIG_HAVE_IDE=y
450# CONFIG_IDE is not set 466# CONFIG_IDE is not set
451 467
@@ -493,10 +509,13 @@ CONFIG_SCSI_SRP_ATTRS=m
493CONFIG_SCSI_SRP_TGT_ATTRS=y 509CONFIG_SCSI_SRP_TGT_ATTRS=y
494CONFIG_SCSI_LOWLEVEL=y 510CONFIG_SCSI_LOWLEVEL=y
495CONFIG_ISCSI_TCP=m 511CONFIG_ISCSI_TCP=m
512# CONFIG_LIBFC is not set
513# CONFIG_LIBFCOE is not set
496CONFIG_53C700_BE_BUS=y 514CONFIG_53C700_BE_BUS=y
497# CONFIG_SCSI_DEBUG is not set 515# CONFIG_SCSI_DEBUG is not set
498CONFIG_BVME6000_SCSI=y 516CONFIG_BVME6000_SCSI=y
499# CONFIG_SCSI_DH is not set 517# CONFIG_SCSI_DH is not set
518# CONFIG_SCSI_OSD_INITIATOR is not set
500CONFIG_MD=y 519CONFIG_MD=y
501CONFIG_BLK_DEV_MD=m 520CONFIG_BLK_DEV_MD=m
502CONFIG_MD_LINEAR=m 521CONFIG_MD_LINEAR=m
@@ -504,7 +523,7 @@ CONFIG_MD_RAID0=m
504CONFIG_MD_RAID1=m 523CONFIG_MD_RAID1=m
505# CONFIG_MD_RAID10 is not set 524# CONFIG_MD_RAID10 is not set
506CONFIG_MD_RAID456=m 525CONFIG_MD_RAID456=m
507CONFIG_MD_RAID5_RESHAPE=y 526CONFIG_MD_RAID6_PQ=m
508# CONFIG_MD_MULTIPATH is not set 527# CONFIG_MD_MULTIPATH is not set
509# CONFIG_MD_FAULTY is not set 528# CONFIG_MD_FAULTY is not set
510CONFIG_BLK_DEV_DM=m 529CONFIG_BLK_DEV_DM=m
@@ -517,6 +536,7 @@ CONFIG_DM_MULTIPATH=m
517# CONFIG_DM_DELAY is not set 536# CONFIG_DM_DELAY is not set
518CONFIG_DM_UEVENT=y 537CONFIG_DM_UEVENT=y
519CONFIG_NETDEVICES=y 538CONFIG_NETDEVICES=y
539CONFIG_COMPAT_NET_DEV_OPS=y
520CONFIG_DUMMY=m 540CONFIG_DUMMY=m
521# CONFIG_BONDING is not set 541# CONFIG_BONDING is not set
522CONFIG_MACVLAN=m 542CONFIG_MACVLAN=m
@@ -527,6 +547,8 @@ CONFIG_VETH=m
527CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
528# CONFIG_MII is not set 548# CONFIG_MII is not set
529CONFIG_BVME6000_NET=y 549CONFIG_BVME6000_NET=y
550# CONFIG_ETHOC is not set
551# CONFIG_DNET is not set
530# CONFIG_IBM_NEW_EMAC_ZMII is not set 552# CONFIG_IBM_NEW_EMAC_ZMII is not set
531# CONFIG_IBM_NEW_EMAC_RGMII is not set 553# CONFIG_IBM_NEW_EMAC_RGMII is not set
532# CONFIG_IBM_NEW_EMAC_TAH is not set 554# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -543,7 +565,10 @@ CONFIG_BVME6000_NET=y
543# 565#
544# CONFIG_WLAN_PRE80211 is not set 566# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set 567# CONFIG_WLAN_80211 is not set
546# CONFIG_IWLWIFI_LEDS is not set 568
569#
570# Enable WiMAX (Networking options) to see the WiMAX drivers
571#
547# CONFIG_WAN is not set 572# CONFIG_WAN is not set
548CONFIG_PPP=m 573CONFIG_PPP=m
549# CONFIG_PPP_MULTILINK is not set 574# CONFIG_PPP_MULTILINK is not set
@@ -601,7 +626,6 @@ CONFIG_MOUSE_PS2=m
601CONFIG_MOUSE_PS2_ALPS=y 626CONFIG_MOUSE_PS2_ALPS=y
602CONFIG_MOUSE_PS2_LOGIPS2PP=y 627CONFIG_MOUSE_PS2_LOGIPS2PP=y
603CONFIG_MOUSE_PS2_SYNAPTICS=y 628CONFIG_MOUSE_PS2_SYNAPTICS=y
604CONFIG_MOUSE_PS2_LIFEBOOK=y
605CONFIG_MOUSE_PS2_TRACKPOINT=y 629CONFIG_MOUSE_PS2_TRACKPOINT=y
606# CONFIG_MOUSE_PS2_ELANTECH is not set 630# CONFIG_MOUSE_PS2_ELANTECH is not set
607# CONFIG_MOUSE_PS2_TOUCHKIT is not set 631# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -641,6 +665,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
641# Non-8250 serial port support 665# Non-8250 serial port support
642# 666#
643CONFIG_UNIX98_PTYS=y 667CONFIG_UNIX98_PTYS=y
668# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
644CONFIG_LEGACY_PTYS=y 669CONFIG_LEGACY_PTYS=y
645CONFIG_LEGACY_PTY_COUNT=256 670CONFIG_LEGACY_PTY_COUNT=256
646# CONFIG_IPMI_HANDLER is not set 671# CONFIG_IPMI_HANDLER is not set
@@ -717,7 +742,6 @@ CONFIG_HIDRAW=y
717# 742#
718# Special HID drivers 743# Special HID drivers
719# 744#
720CONFIG_HID_COMPAT=y
721# CONFIG_USB_SUPPORT is not set 745# CONFIG_USB_SUPPORT is not set
722# CONFIG_MMC is not set 746# CONFIG_MMC is not set
723# CONFIG_MEMSTICK is not set 747# CONFIG_MEMSTICK is not set
@@ -725,9 +749,9 @@ CONFIG_HID_COMPAT=y
725# CONFIG_ACCESSIBILITY is not set 749# CONFIG_ACCESSIBILITY is not set
726# CONFIG_RTC_CLASS is not set 750# CONFIG_RTC_CLASS is not set
727# CONFIG_DMADEVICES is not set 751# CONFIG_DMADEVICES is not set
752# CONFIG_AUXDISPLAY is not set
728# CONFIG_UIO is not set 753# CONFIG_UIO is not set
729# CONFIG_STAGING is not set 754# CONFIG_STAGING is not set
730CONFIG_STAGING_EXCLUDE_BUILD=y
731 755
732# 756#
733# Character devices 757# Character devices
@@ -742,6 +766,7 @@ CONFIG_EXT2_FS=y
742# CONFIG_EXT2_FS_XATTR is not set 766# CONFIG_EXT2_FS_XATTR is not set
743# CONFIG_EXT2_FS_XIP is not set 767# CONFIG_EXT2_FS_XIP is not set
744CONFIG_EXT3_FS=y 768CONFIG_EXT3_FS=y
769# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
745# CONFIG_EXT3_FS_XATTR is not set 770# CONFIG_EXT3_FS_XATTR is not set
746# CONFIG_EXT4_FS is not set 771# CONFIG_EXT4_FS is not set
747CONFIG_JBD=y 772CONFIG_JBD=y
@@ -768,13 +793,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
768# CONFIG_OCFS2_FS_STATS is not set 793# CONFIG_OCFS2_FS_STATS is not set
769# CONFIG_OCFS2_DEBUG_MASKLOG is not set 794# CONFIG_OCFS2_DEBUG_MASKLOG is not set
770# CONFIG_OCFS2_DEBUG_FS is not set 795# CONFIG_OCFS2_DEBUG_FS is not set
771# CONFIG_OCFS2_COMPAT_JBD is not set 796# CONFIG_OCFS2_FS_POSIX_ACL is not set
797# CONFIG_BTRFS_FS is not set
772CONFIG_DNOTIFY=y 798CONFIG_DNOTIFY=y
773CONFIG_INOTIFY=y 799CONFIG_INOTIFY=y
774CONFIG_INOTIFY_USER=y 800CONFIG_INOTIFY_USER=y
775CONFIG_QUOTA=y 801CONFIG_QUOTA=y
776CONFIG_QUOTA_NETLINK_INTERFACE=y 802CONFIG_QUOTA_NETLINK_INTERFACE=y
777# CONFIG_PRINT_QUOTA_WARNING is not set 803# CONFIG_PRINT_QUOTA_WARNING is not set
804CONFIG_QUOTA_TREE=m
778# CONFIG_QFMT_V1 is not set 805# CONFIG_QFMT_V1 is not set
779# CONFIG_QFMT_V2 is not set 806# CONFIG_QFMT_V2 is not set
780CONFIG_QUOTACTL=y 807CONFIG_QUOTACTL=y
@@ -783,6 +810,11 @@ CONFIG_AUTOFS4_FS=m
783CONFIG_FUSE_FS=m 810CONFIG_FUSE_FS=m
784 811
785# 812#
813# Caches
814#
815# CONFIG_FSCACHE is not set
816
817#
786# CD-ROM/DVD Filesystems 818# CD-ROM/DVD Filesystems
787# 819#
788CONFIG_ISO9660_FS=y 820CONFIG_ISO9660_FS=y
@@ -813,10 +845,7 @@ CONFIG_TMPFS=y
813# CONFIG_TMPFS_POSIX_ACL is not set 845# CONFIG_TMPFS_POSIX_ACL is not set
814# CONFIG_HUGETLB_PAGE is not set 846# CONFIG_HUGETLB_PAGE is not set
815CONFIG_CONFIGFS_FS=m 847CONFIG_CONFIGFS_FS=m
816 848CONFIG_MISC_FILESYSTEMS=y
817#
818# Miscellaneous filesystems
819#
820# CONFIG_ADFS_FS is not set 849# CONFIG_ADFS_FS is not set
821CONFIG_AFFS_FS=m 850CONFIG_AFFS_FS=m
822CONFIG_HFS_FS=m 851CONFIG_HFS_FS=m
@@ -825,6 +854,9 @@ CONFIG_HFSPLUS_FS=m
825# CONFIG_BFS_FS is not set 854# CONFIG_BFS_FS is not set
826# CONFIG_EFS_FS is not set 855# CONFIG_EFS_FS is not set
827CONFIG_CRAMFS=m 856CONFIG_CRAMFS=m
857CONFIG_SQUASHFS=m
858# CONFIG_SQUASHFS_EMBEDDED is not set
859CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
828# CONFIG_VXFS_FS is not set 860# CONFIG_VXFS_FS is not set
829CONFIG_MINIX_FS=y 861CONFIG_MINIX_FS=y
830# CONFIG_OMFS_FS is not set 862# CONFIG_OMFS_FS is not set
@@ -835,6 +867,7 @@ CONFIG_SYSV_FS=m
835CONFIG_UFS_FS=m 867CONFIG_UFS_FS=m
836# CONFIG_UFS_FS_WRITE is not set 868# CONFIG_UFS_FS_WRITE is not set
837# CONFIG_UFS_DEBUG is not set 869# CONFIG_UFS_DEBUG is not set
870# CONFIG_NILFS2_FS is not set
838CONFIG_NETWORK_FILESYSTEMS=y 871CONFIG_NETWORK_FILESYSTEMS=y
839CONFIG_NFS_FS=y 872CONFIG_NFS_FS=y
840CONFIG_NFS_V3=y 873CONFIG_NFS_V3=y
@@ -851,7 +884,6 @@ CONFIG_EXPORTFS=m
851CONFIG_NFS_COMMON=y 884CONFIG_NFS_COMMON=y
852CONFIG_SUNRPC=y 885CONFIG_SUNRPC=y
853CONFIG_SUNRPC_GSS=y 886CONFIG_SUNRPC_GSS=y
854# CONFIG_SUNRPC_REGISTER_V4 is not set
855CONFIG_RPCSEC_GSS_KRB5=y 887CONFIG_RPCSEC_GSS_KRB5=y
856# CONFIG_RPCSEC_GSS_SPKM3 is not set 888# CONFIG_RPCSEC_GSS_SPKM3 is not set
857CONFIG_SMB_FS=m 889CONFIG_SMB_FS=m
@@ -927,11 +959,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
927CONFIG_DEBUG_MEMORY_INIT=y 959CONFIG_DEBUG_MEMORY_INIT=y
928# CONFIG_RCU_CPU_STALL_DETECTOR is not set 960# CONFIG_RCU_CPU_STALL_DETECTOR is not set
929CONFIG_SYSCTL_SYSCALL_CHECK=y 961CONFIG_SYSCTL_SYSCALL_CHECK=y
930
931#
932# Tracers
933#
934# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
935# CONFIG_SAMPLES is not set 962# CONFIG_SAMPLES is not set
936 963
937# 964#
@@ -952,13 +979,21 @@ CONFIG_CRYPTO=y
952# 979#
953# CONFIG_CRYPTO_FIPS is not set 980# CONFIG_CRYPTO_FIPS is not set
954CONFIG_CRYPTO_ALGAPI=y 981CONFIG_CRYPTO_ALGAPI=y
955CONFIG_CRYPTO_AEAD=y 982CONFIG_CRYPTO_ALGAPI2=y
983CONFIG_CRYPTO_AEAD=m
984CONFIG_CRYPTO_AEAD2=y
956CONFIG_CRYPTO_BLKCIPHER=y 985CONFIG_CRYPTO_BLKCIPHER=y
986CONFIG_CRYPTO_BLKCIPHER2=y
957CONFIG_CRYPTO_HASH=y 987CONFIG_CRYPTO_HASH=y
958CONFIG_CRYPTO_RNG=y 988CONFIG_CRYPTO_HASH2=y
989CONFIG_CRYPTO_RNG=m
990CONFIG_CRYPTO_RNG2=y
991CONFIG_CRYPTO_PCOMP=y
959CONFIG_CRYPTO_MANAGER=y 992CONFIG_CRYPTO_MANAGER=y
993CONFIG_CRYPTO_MANAGER2=y
960CONFIG_CRYPTO_GF128MUL=m 994CONFIG_CRYPTO_GF128MUL=m
961CONFIG_CRYPTO_NULL=m 995CONFIG_CRYPTO_NULL=m
996CONFIG_CRYPTO_WORKQUEUE=y
962CONFIG_CRYPTO_CRYPTD=m 997CONFIG_CRYPTO_CRYPTD=m
963CONFIG_CRYPTO_AUTHENC=m 998CONFIG_CRYPTO_AUTHENC=m
964CONFIG_CRYPTO_TEST=m 999CONFIG_CRYPTO_TEST=m
@@ -1028,6 +1063,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1028# Compression 1063# Compression
1029# 1064#
1030CONFIG_CRYPTO_DEFLATE=m 1065CONFIG_CRYPTO_DEFLATE=m
1066CONFIG_CRYPTO_ZLIB=m
1031CONFIG_CRYPTO_LZO=m 1067CONFIG_CRYPTO_LZO=m
1032 1068
1033# 1069#
@@ -1035,11 +1071,13 @@ CONFIG_CRYPTO_LZO=m
1035# 1071#
1036# CONFIG_CRYPTO_ANSI_CPRNG is not set 1072# CONFIG_CRYPTO_ANSI_CPRNG is not set
1037# CONFIG_CRYPTO_HW is not set 1073# CONFIG_CRYPTO_HW is not set
1074# CONFIG_BINARY_PRINTF is not set
1038 1075
1039# 1076#
1040# Library routines 1077# Library routines
1041# 1078#
1042CONFIG_BITREVERSE=m 1079CONFIG_BITREVERSE=m
1080CONFIG_GENERIC_FIND_LAST_BIT=y
1043CONFIG_CRC_CCITT=m 1081CONFIG_CRC_CCITT=m
1044CONFIG_CRC16=m 1082CONFIG_CRC16=m
1045CONFIG_CRC_T10DIF=y 1083CONFIG_CRC_T10DIF=y
@@ -1051,10 +1089,13 @@ CONFIG_ZLIB_INFLATE=y
1051CONFIG_ZLIB_DEFLATE=m 1089CONFIG_ZLIB_DEFLATE=m
1052CONFIG_LZO_COMPRESS=m 1090CONFIG_LZO_COMPRESS=m
1053CONFIG_LZO_DECOMPRESS=m 1091CONFIG_LZO_DECOMPRESS=m
1092CONFIG_DECOMPRESS_GZIP=y
1093CONFIG_DECOMPRESS_BZIP2=y
1094CONFIG_DECOMPRESS_LZMA=y
1054CONFIG_TEXTSEARCH=y 1095CONFIG_TEXTSEARCH=y
1055CONFIG_TEXTSEARCH_KMP=m 1096CONFIG_TEXTSEARCH_KMP=m
1056CONFIG_TEXTSEARCH_BM=m 1097CONFIG_TEXTSEARCH_BM=m
1057CONFIG_TEXTSEARCH_FSM=m 1098CONFIG_TEXTSEARCH_FSM=m
1058CONFIG_PLIST=y
1059CONFIG_HAS_IOMEM=y 1099CONFIG_HAS_IOMEM=y
1060CONFIG_HAS_DMA=y 1100CONFIG_HAS_DMA=y
1101CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 5556ef088d04..bc0565f63a15 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:46 2008 4# Wed Apr 22 20:48:01 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -141,12 +152,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141CONFIG_NEED_MULTIPLE_NODES=y 152CONFIG_NEED_MULTIPLE_NODES=y
142CONFIG_PAGEFLAGS_EXTENDED=y 153CONFIG_PAGEFLAGS_EXTENDED=y
143CONFIG_SPLIT_PTLOCK_CPUS=4 154CONFIG_SPLIT_PTLOCK_CPUS=4
144# CONFIG_RESOURCES_64BIT is not set
145# CONFIG_PHYS_ADDR_T_64BIT is not set 155# CONFIG_PHYS_ADDR_T_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1 156CONFIG_ZONE_DMA_FLAG=1
147CONFIG_BOUNCE=y 157CONFIG_BOUNCE=y
148CONFIG_VIRT_TO_BUS=y 158CONFIG_VIRT_TO_BUS=y
149CONFIG_UNEVICTABLE_LRU=y 159CONFIG_UNEVICTABLE_LRU=y
160CONFIG_HAVE_MLOCK=y
161CONFIG_HAVE_MLOCKED_PAGE_BIT=y
150 162
151# 163#
152# General setup 164# General setup
@@ -257,6 +269,7 @@ CONFIG_NETFILTER_XTABLES=m
257CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 269CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
258CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 270CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
259CONFIG_NETFILTER_XT_TARGET_DSCP=m 271CONFIG_NETFILTER_XT_TARGET_DSCP=m
272CONFIG_NETFILTER_XT_TARGET_HL=m
260CONFIG_NETFILTER_XT_TARGET_MARK=m 273CONFIG_NETFILTER_XT_TARGET_MARK=m
261CONFIG_NETFILTER_XT_TARGET_NFLOG=m 274CONFIG_NETFILTER_XT_TARGET_NFLOG=m
262CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 275CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -265,6 +278,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
265CONFIG_NETFILTER_XT_TARGET_TRACE=m 278CONFIG_NETFILTER_XT_TARGET_TRACE=m
266CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 279CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
267CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 280CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
281CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
268CONFIG_NETFILTER_XT_MATCH_COMMENT=m 282CONFIG_NETFILTER_XT_MATCH_COMMENT=m
269CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 283CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
270CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 284CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -275,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
275CONFIG_NETFILTER_XT_MATCH_ESP=m 289CONFIG_NETFILTER_XT_MATCH_ESP=m
276CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 290CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
277CONFIG_NETFILTER_XT_MATCH_HELPER=m 291CONFIG_NETFILTER_XT_MATCH_HELPER=m
292CONFIG_NETFILTER_XT_MATCH_HL=m
278CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 293CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
279CONFIG_NETFILTER_XT_MATCH_LENGTH=m 294CONFIG_NETFILTER_XT_MATCH_LENGTH=m
280CONFIG_NETFILTER_XT_MATCH_LIMIT=m 295CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -353,25 +368,20 @@ CONFIG_IP6_NF_MATCH_HL=m
353CONFIG_IP6_NF_MATCH_IPV6HEADER=m 368CONFIG_IP6_NF_MATCH_IPV6HEADER=m
354CONFIG_IP6_NF_MATCH_MH=m 369CONFIG_IP6_NF_MATCH_MH=m
355CONFIG_IP6_NF_MATCH_RT=m 370CONFIG_IP6_NF_MATCH_RT=m
371CONFIG_IP6_NF_TARGET_HL=m
356CONFIG_IP6_NF_TARGET_LOG=m 372CONFIG_IP6_NF_TARGET_LOG=m
357CONFIG_IP6_NF_FILTER=m 373CONFIG_IP6_NF_FILTER=m
358CONFIG_IP6_NF_TARGET_REJECT=m 374CONFIG_IP6_NF_TARGET_REJECT=m
359CONFIG_IP6_NF_MANGLE=m 375CONFIG_IP6_NF_MANGLE=m
360CONFIG_IP6_NF_TARGET_HL=m
361CONFIG_IP6_NF_RAW=m 376CONFIG_IP6_NF_RAW=m
362CONFIG_IP_DCCP=m 377CONFIG_IP_DCCP=m
363CONFIG_INET_DCCP_DIAG=m 378CONFIG_INET_DCCP_DIAG=m
364CONFIG_IP_DCCP_ACKVEC=y
365 379
366# 380#
367# DCCP CCIDs Configuration (EXPERIMENTAL) 381# DCCP CCIDs Configuration (EXPERIMENTAL)
368# 382#
369CONFIG_IP_DCCP_CCID2=m
370# CONFIG_IP_DCCP_CCID2_DEBUG is not set 383# CONFIG_IP_DCCP_CCID2_DEBUG is not set
371CONFIG_IP_DCCP_CCID3=m 384# CONFIG_IP_DCCP_CCID3 is not set
372# CONFIG_IP_DCCP_CCID3_DEBUG is not set
373CONFIG_IP_DCCP_CCID3_RTO=100
374CONFIG_IP_DCCP_TFRC_LIB=m
375CONFIG_IP_SCTP=m 385CONFIG_IP_SCTP=m
376# CONFIG_SCTP_DBG_MSG is not set 386# CONFIG_SCTP_DBG_MSG is not set
377# CONFIG_SCTP_DBG_OBJCNT is not set 387# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -393,8 +403,10 @@ CONFIG_ATALK=m
393# CONFIG_LAPB is not set 403# CONFIG_LAPB is not set
394# CONFIG_ECONET is not set 404# CONFIG_ECONET is not set
395# CONFIG_WAN_ROUTER is not set 405# CONFIG_WAN_ROUTER is not set
406# CONFIG_PHONET is not set
396# CONFIG_NET_SCHED is not set 407# CONFIG_NET_SCHED is not set
397CONFIG_NET_CLS_ROUTE=y 408CONFIG_NET_CLS_ROUTE=y
409# CONFIG_DCB is not set
398 410
399# 411#
400# Network testing 412# Network testing
@@ -405,8 +417,8 @@ CONFIG_NET_CLS_ROUTE=y
405# CONFIG_IRDA is not set 417# CONFIG_IRDA is not set
406# CONFIG_BT is not set 418# CONFIG_BT is not set
407# CONFIG_AF_RXRPC is not set 419# CONFIG_AF_RXRPC is not set
408# CONFIG_PHONET is not set
409# CONFIG_WIRELESS is not set 420# CONFIG_WIRELESS is not set
421# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
412 424
@@ -442,9 +454,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
442CONFIG_ATA_OVER_ETH=m 454CONFIG_ATA_OVER_ETH=m
443# CONFIG_BLK_DEV_HD is not set 455# CONFIG_BLK_DEV_HD is not set
444CONFIG_MISC_DEVICES=y 456CONFIG_MISC_DEVICES=y
445# CONFIG_EEPROM_93CX6 is not set
446# CONFIG_ENCLOSURE_SERVICES is not set 457# CONFIG_ENCLOSURE_SERVICES is not set
447# CONFIG_C2PORT is not set 458# CONFIG_C2PORT is not set
459
460#
461# EEPROM support
462#
463# CONFIG_EEPROM_93CX6 is not set
448CONFIG_HAVE_IDE=y 464CONFIG_HAVE_IDE=y
449# CONFIG_IDE is not set 465# CONFIG_IDE is not set
450 466
@@ -492,8 +508,11 @@ CONFIG_SCSI_SRP_ATTRS=m
492CONFIG_SCSI_SRP_TGT_ATTRS=y 508CONFIG_SCSI_SRP_TGT_ATTRS=y
493CONFIG_SCSI_LOWLEVEL=y 509CONFIG_SCSI_LOWLEVEL=y
494CONFIG_ISCSI_TCP=m 510CONFIG_ISCSI_TCP=m
511# CONFIG_LIBFC is not set
512# CONFIG_LIBFCOE is not set
495# CONFIG_SCSI_DEBUG is not set 513# CONFIG_SCSI_DEBUG is not set
496# CONFIG_SCSI_DH is not set 514# CONFIG_SCSI_DH is not set
515# CONFIG_SCSI_OSD_INITIATOR is not set
497CONFIG_MD=y 516CONFIG_MD=y
498CONFIG_BLK_DEV_MD=m 517CONFIG_BLK_DEV_MD=m
499CONFIG_MD_LINEAR=m 518CONFIG_MD_LINEAR=m
@@ -501,7 +520,7 @@ CONFIG_MD_RAID0=m
501CONFIG_MD_RAID1=m 520CONFIG_MD_RAID1=m
502# CONFIG_MD_RAID10 is not set 521# CONFIG_MD_RAID10 is not set
503CONFIG_MD_RAID456=m 522CONFIG_MD_RAID456=m
504CONFIG_MD_RAID5_RESHAPE=y 523CONFIG_MD_RAID6_PQ=m
505# CONFIG_MD_MULTIPATH is not set 524# CONFIG_MD_MULTIPATH is not set
506# CONFIG_MD_FAULTY is not set 525# CONFIG_MD_FAULTY is not set
507CONFIG_BLK_DEV_DM=m 526CONFIG_BLK_DEV_DM=m
@@ -514,6 +533,7 @@ CONFIG_DM_MULTIPATH=m
514# CONFIG_DM_DELAY is not set 533# CONFIG_DM_DELAY is not set
515CONFIG_DM_UEVENT=y 534CONFIG_DM_UEVENT=y
516CONFIG_NETDEVICES=y 535CONFIG_NETDEVICES=y
536CONFIG_COMPAT_NET_DEV_OPS=y
517CONFIG_DUMMY=m 537CONFIG_DUMMY=m
518# CONFIG_BONDING is not set 538# CONFIG_BONDING is not set
519CONFIG_MACVLAN=m 539CONFIG_MACVLAN=m
@@ -524,6 +544,8 @@ CONFIG_VETH=m
524CONFIG_NET_ETHERNET=y 544CONFIG_NET_ETHERNET=y
525# CONFIG_MII is not set 545# CONFIG_MII is not set
526CONFIG_HPLANCE=y 546CONFIG_HPLANCE=y
547# CONFIG_ETHOC is not set
548# CONFIG_DNET is not set
527# CONFIG_IBM_NEW_EMAC_ZMII is not set 549# CONFIG_IBM_NEW_EMAC_ZMII is not set
528# CONFIG_IBM_NEW_EMAC_RGMII is not set 550# CONFIG_IBM_NEW_EMAC_RGMII is not set
529# CONFIG_IBM_NEW_EMAC_TAH is not set 551# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -540,7 +562,10 @@ CONFIG_HPLANCE=y
540# 562#
541# CONFIG_WLAN_PRE80211 is not set 563# CONFIG_WLAN_PRE80211 is not set
542# CONFIG_WLAN_80211 is not set 564# CONFIG_WLAN_80211 is not set
543# CONFIG_IWLWIFI_LEDS is not set 565
566#
567# Enable WiMAX (Networking options) to see the WiMAX drivers
568#
544# CONFIG_WAN is not set 569# CONFIG_WAN is not set
545CONFIG_PPP=m 570CONFIG_PPP=m
546# CONFIG_PPP_MULTILINK is not set 571# CONFIG_PPP_MULTILINK is not set
@@ -600,7 +625,6 @@ CONFIG_MOUSE_PS2=m
600CONFIG_MOUSE_PS2_ALPS=y 625CONFIG_MOUSE_PS2_ALPS=y
601CONFIG_MOUSE_PS2_LOGIPS2PP=y 626CONFIG_MOUSE_PS2_LOGIPS2PP=y
602CONFIG_MOUSE_PS2_SYNAPTICS=y 627CONFIG_MOUSE_PS2_SYNAPTICS=y
603CONFIG_MOUSE_PS2_LIFEBOOK=y
604CONFIG_MOUSE_PS2_TRACKPOINT=y 628CONFIG_MOUSE_PS2_TRACKPOINT=y
605# CONFIG_MOUSE_PS2_ELANTECH is not set 629# CONFIG_MOUSE_PS2_ELANTECH is not set
606# CONFIG_MOUSE_PS2_TOUCHKIT is not set 630# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -646,6 +670,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
646# Non-8250 serial port support 670# Non-8250 serial port support
647# 671#
648CONFIG_UNIX98_PTYS=y 672CONFIG_UNIX98_PTYS=y
673# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
649CONFIG_LEGACY_PTYS=y 674CONFIG_LEGACY_PTYS=y
650CONFIG_LEGACY_PTY_COUNT=256 675CONFIG_LEGACY_PTY_COUNT=256
651# CONFIG_IPMI_HANDLER is not set 676# CONFIG_IPMI_HANDLER is not set
@@ -728,6 +753,7 @@ CONFIG_FB_HP300=y
728# CONFIG_FB_VIRTUAL is not set 753# CONFIG_FB_VIRTUAL is not set
729# CONFIG_FB_METRONOME is not set 754# CONFIG_FB_METRONOME is not set
730# CONFIG_FB_MB862XX is not set 755# CONFIG_FB_MB862XX is not set
756# CONFIG_FB_BROADSHEET is not set
731# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 757# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
732 758
733# 759#
@@ -759,7 +785,6 @@ CONFIG_HIDRAW=y
759# 785#
760# Special HID drivers 786# Special HID drivers
761# 787#
762CONFIG_HID_COMPAT=y
763# CONFIG_USB_SUPPORT is not set 788# CONFIG_USB_SUPPORT is not set
764# CONFIG_MMC is not set 789# CONFIG_MMC is not set
765# CONFIG_MEMSTICK is not set 790# CONFIG_MEMSTICK is not set
@@ -767,9 +792,9 @@ CONFIG_HID_COMPAT=y
767# CONFIG_ACCESSIBILITY is not set 792# CONFIG_ACCESSIBILITY is not set
768# CONFIG_RTC_CLASS is not set 793# CONFIG_RTC_CLASS is not set
769# CONFIG_DMADEVICES is not set 794# CONFIG_DMADEVICES is not set
795# CONFIG_AUXDISPLAY is not set
770# CONFIG_UIO is not set 796# CONFIG_UIO is not set
771# CONFIG_STAGING is not set 797# CONFIG_STAGING is not set
772CONFIG_STAGING_EXCLUDE_BUILD=y
773 798
774# 799#
775# Character devices 800# Character devices
@@ -782,6 +807,7 @@ CONFIG_EXT2_FS=y
782# CONFIG_EXT2_FS_XATTR is not set 807# CONFIG_EXT2_FS_XATTR is not set
783# CONFIG_EXT2_FS_XIP is not set 808# CONFIG_EXT2_FS_XIP is not set
784CONFIG_EXT3_FS=y 809CONFIG_EXT3_FS=y
810# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
785# CONFIG_EXT3_FS_XATTR is not set 811# CONFIG_EXT3_FS_XATTR is not set
786# CONFIG_EXT4_FS is not set 812# CONFIG_EXT4_FS is not set
787CONFIG_JBD=y 813CONFIG_JBD=y
@@ -808,13 +834,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
808# CONFIG_OCFS2_FS_STATS is not set 834# CONFIG_OCFS2_FS_STATS is not set
809# CONFIG_OCFS2_DEBUG_MASKLOG is not set 835# CONFIG_OCFS2_DEBUG_MASKLOG is not set
810# CONFIG_OCFS2_DEBUG_FS is not set 836# CONFIG_OCFS2_DEBUG_FS is not set
811# CONFIG_OCFS2_COMPAT_JBD is not set 837# CONFIG_OCFS2_FS_POSIX_ACL is not set
838# CONFIG_BTRFS_FS is not set
812CONFIG_DNOTIFY=y 839CONFIG_DNOTIFY=y
813CONFIG_INOTIFY=y 840CONFIG_INOTIFY=y
814CONFIG_INOTIFY_USER=y 841CONFIG_INOTIFY_USER=y
815CONFIG_QUOTA=y 842CONFIG_QUOTA=y
816CONFIG_QUOTA_NETLINK_INTERFACE=y 843CONFIG_QUOTA_NETLINK_INTERFACE=y
817# CONFIG_PRINT_QUOTA_WARNING is not set 844# CONFIG_PRINT_QUOTA_WARNING is not set
845CONFIG_QUOTA_TREE=m
818# CONFIG_QFMT_V1 is not set 846# CONFIG_QFMT_V1 is not set
819# CONFIG_QFMT_V2 is not set 847# CONFIG_QFMT_V2 is not set
820CONFIG_QUOTACTL=y 848CONFIG_QUOTACTL=y
@@ -823,6 +851,11 @@ CONFIG_AUTOFS4_FS=m
823CONFIG_FUSE_FS=m 851CONFIG_FUSE_FS=m
824 852
825# 853#
854# Caches
855#
856# CONFIG_FSCACHE is not set
857
858#
826# CD-ROM/DVD Filesystems 859# CD-ROM/DVD Filesystems
827# 860#
828CONFIG_ISO9660_FS=y 861CONFIG_ISO9660_FS=y
@@ -853,10 +886,7 @@ CONFIG_TMPFS=y
853# CONFIG_TMPFS_POSIX_ACL is not set 886# CONFIG_TMPFS_POSIX_ACL is not set
854# CONFIG_HUGETLB_PAGE is not set 887# CONFIG_HUGETLB_PAGE is not set
855CONFIG_CONFIGFS_FS=m 888CONFIG_CONFIGFS_FS=m
856 889CONFIG_MISC_FILESYSTEMS=y
857#
858# Miscellaneous filesystems
859#
860# CONFIG_ADFS_FS is not set 890# CONFIG_ADFS_FS is not set
861CONFIG_AFFS_FS=m 891CONFIG_AFFS_FS=m
862CONFIG_HFS_FS=m 892CONFIG_HFS_FS=m
@@ -865,6 +895,9 @@ CONFIG_HFSPLUS_FS=m
865# CONFIG_BFS_FS is not set 895# CONFIG_BFS_FS is not set
866# CONFIG_EFS_FS is not set 896# CONFIG_EFS_FS is not set
867CONFIG_CRAMFS=m 897CONFIG_CRAMFS=m
898CONFIG_SQUASHFS=m
899# CONFIG_SQUASHFS_EMBEDDED is not set
900CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
868# CONFIG_VXFS_FS is not set 901# CONFIG_VXFS_FS is not set
869CONFIG_MINIX_FS=y 902CONFIG_MINIX_FS=y
870# CONFIG_OMFS_FS is not set 903# CONFIG_OMFS_FS is not set
@@ -875,6 +908,7 @@ CONFIG_SYSV_FS=m
875CONFIG_UFS_FS=m 908CONFIG_UFS_FS=m
876# CONFIG_UFS_FS_WRITE is not set 909# CONFIG_UFS_FS_WRITE is not set
877# CONFIG_UFS_DEBUG is not set 910# CONFIG_UFS_DEBUG is not set
911# CONFIG_NILFS2_FS is not set
878CONFIG_NETWORK_FILESYSTEMS=y 912CONFIG_NETWORK_FILESYSTEMS=y
879CONFIG_NFS_FS=y 913CONFIG_NFS_FS=y
880CONFIG_NFS_V3=y 914CONFIG_NFS_V3=y
@@ -891,7 +925,6 @@ CONFIG_EXPORTFS=m
891CONFIG_NFS_COMMON=y 925CONFIG_NFS_COMMON=y
892CONFIG_SUNRPC=y 926CONFIG_SUNRPC=y
893CONFIG_SUNRPC_GSS=y 927CONFIG_SUNRPC_GSS=y
894# CONFIG_SUNRPC_REGISTER_V4 is not set
895CONFIG_RPCSEC_GSS_KRB5=y 928CONFIG_RPCSEC_GSS_KRB5=y
896# CONFIG_RPCSEC_GSS_SPKM3 is not set 929# CONFIG_RPCSEC_GSS_SPKM3 is not set
897CONFIG_SMB_FS=m 930CONFIG_SMB_FS=m
@@ -966,11 +999,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
966CONFIG_DEBUG_MEMORY_INIT=y 999CONFIG_DEBUG_MEMORY_INIT=y
967# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1000# CONFIG_RCU_CPU_STALL_DETECTOR is not set
968CONFIG_SYSCTL_SYSCALL_CHECK=y 1001CONFIG_SYSCTL_SYSCALL_CHECK=y
969
970#
971# Tracers
972#
973# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
974# CONFIG_SAMPLES is not set 1002# CONFIG_SAMPLES is not set
975 1003
976# 1004#
@@ -991,13 +1019,21 @@ CONFIG_CRYPTO=y
991# 1019#
992# CONFIG_CRYPTO_FIPS is not set 1020# CONFIG_CRYPTO_FIPS is not set
993CONFIG_CRYPTO_ALGAPI=y 1021CONFIG_CRYPTO_ALGAPI=y
994CONFIG_CRYPTO_AEAD=y 1022CONFIG_CRYPTO_ALGAPI2=y
1023CONFIG_CRYPTO_AEAD=m
1024CONFIG_CRYPTO_AEAD2=y
995CONFIG_CRYPTO_BLKCIPHER=y 1025CONFIG_CRYPTO_BLKCIPHER=y
1026CONFIG_CRYPTO_BLKCIPHER2=y
996CONFIG_CRYPTO_HASH=y 1027CONFIG_CRYPTO_HASH=y
997CONFIG_CRYPTO_RNG=y 1028CONFIG_CRYPTO_HASH2=y
1029CONFIG_CRYPTO_RNG=m
1030CONFIG_CRYPTO_RNG2=y
1031CONFIG_CRYPTO_PCOMP=y
998CONFIG_CRYPTO_MANAGER=y 1032CONFIG_CRYPTO_MANAGER=y
1033CONFIG_CRYPTO_MANAGER2=y
999CONFIG_CRYPTO_GF128MUL=m 1034CONFIG_CRYPTO_GF128MUL=m
1000CONFIG_CRYPTO_NULL=m 1035CONFIG_CRYPTO_NULL=m
1036CONFIG_CRYPTO_WORKQUEUE=y
1001CONFIG_CRYPTO_CRYPTD=m 1037CONFIG_CRYPTO_CRYPTD=m
1002CONFIG_CRYPTO_AUTHENC=m 1038CONFIG_CRYPTO_AUTHENC=m
1003CONFIG_CRYPTO_TEST=m 1039CONFIG_CRYPTO_TEST=m
@@ -1067,6 +1103,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1067# Compression 1103# Compression
1068# 1104#
1069CONFIG_CRYPTO_DEFLATE=m 1105CONFIG_CRYPTO_DEFLATE=m
1106CONFIG_CRYPTO_ZLIB=m
1070CONFIG_CRYPTO_LZO=m 1107CONFIG_CRYPTO_LZO=m
1071 1108
1072# 1109#
@@ -1074,11 +1111,13 @@ CONFIG_CRYPTO_LZO=m
1074# 1111#
1075# CONFIG_CRYPTO_ANSI_CPRNG is not set 1112# CONFIG_CRYPTO_ANSI_CPRNG is not set
1076# CONFIG_CRYPTO_HW is not set 1113# CONFIG_CRYPTO_HW is not set
1114# CONFIG_BINARY_PRINTF is not set
1077 1115
1078# 1116#
1079# Library routines 1117# Library routines
1080# 1118#
1081CONFIG_BITREVERSE=y 1119CONFIG_BITREVERSE=y
1120CONFIG_GENERIC_FIND_LAST_BIT=y
1082CONFIG_CRC_CCITT=m 1121CONFIG_CRC_CCITT=m
1083CONFIG_CRC16=m 1122CONFIG_CRC16=m
1084CONFIG_CRC_T10DIF=y 1123CONFIG_CRC_T10DIF=y
@@ -1090,10 +1129,13 @@ CONFIG_ZLIB_INFLATE=y
1090CONFIG_ZLIB_DEFLATE=m 1129CONFIG_ZLIB_DEFLATE=m
1091CONFIG_LZO_COMPRESS=m 1130CONFIG_LZO_COMPRESS=m
1092CONFIG_LZO_DECOMPRESS=m 1131CONFIG_LZO_DECOMPRESS=m
1132CONFIG_DECOMPRESS_GZIP=y
1133CONFIG_DECOMPRESS_BZIP2=y
1134CONFIG_DECOMPRESS_LZMA=y
1093CONFIG_TEXTSEARCH=y 1135CONFIG_TEXTSEARCH=y
1094CONFIG_TEXTSEARCH_KMP=m 1136CONFIG_TEXTSEARCH_KMP=m
1095CONFIG_TEXTSEARCH_BM=m 1137CONFIG_TEXTSEARCH_BM=m
1096CONFIG_TEXTSEARCH_FSM=m 1138CONFIG_TEXTSEARCH_FSM=m
1097CONFIG_PLIST=y
1098CONFIG_HAS_IOMEM=y 1139CONFIG_HAS_IOMEM=y
1099CONFIG_HAS_DMA=y 1140CONFIG_HAS_DMA=y
1141CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index c6de25724a25..9991b64fea57 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:47 2008 4# Wed Apr 22 20:48:03 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -142,12 +153,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
142CONFIG_NEED_MULTIPLE_NODES=y 153CONFIG_NEED_MULTIPLE_NODES=y
143CONFIG_PAGEFLAGS_EXTENDED=y 154CONFIG_PAGEFLAGS_EXTENDED=y
144CONFIG_SPLIT_PTLOCK_CPUS=4 155CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set
146# CONFIG_PHYS_ADDR_T_64BIT is not set 156# CONFIG_PHYS_ADDR_T_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1 157CONFIG_ZONE_DMA_FLAG=1
148CONFIG_BOUNCE=y 158CONFIG_BOUNCE=y
149CONFIG_VIRT_TO_BUS=y 159CONFIG_VIRT_TO_BUS=y
150CONFIG_UNEVICTABLE_LRU=y 160CONFIG_UNEVICTABLE_LRU=y
161CONFIG_HAVE_MLOCK=y
162CONFIG_HAVE_MLOCKED_PAGE_BIT=y
151 163
152# 164#
153# General setup 165# General setup
@@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m
255CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 267CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
256CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 268CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
257CONFIG_NETFILTER_XT_TARGET_DSCP=m 269CONFIG_NETFILTER_XT_TARGET_DSCP=m
270CONFIG_NETFILTER_XT_TARGET_HL=m
258CONFIG_NETFILTER_XT_TARGET_MARK=m 271CONFIG_NETFILTER_XT_TARGET_MARK=m
259CONFIG_NETFILTER_XT_TARGET_NFLOG=m 272CONFIG_NETFILTER_XT_TARGET_NFLOG=m
260CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
263CONFIG_NETFILTER_XT_TARGET_TRACE=m 276CONFIG_NETFILTER_XT_TARGET_TRACE=m
264CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
265CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
279CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
266CONFIG_NETFILTER_XT_MATCH_COMMENT=m 280CONFIG_NETFILTER_XT_MATCH_COMMENT=m
267CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 281CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
268CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 282CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
273CONFIG_NETFILTER_XT_MATCH_ESP=m 287CONFIG_NETFILTER_XT_MATCH_ESP=m
274CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
275CONFIG_NETFILTER_XT_MATCH_HELPER=m 289CONFIG_NETFILTER_XT_MATCH_HELPER=m
290CONFIG_NETFILTER_XT_MATCH_HL=m
276CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 291CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
277CONFIG_NETFILTER_XT_MATCH_LENGTH=m 292CONFIG_NETFILTER_XT_MATCH_LENGTH=m
278CONFIG_NETFILTER_XT_MATCH_LIMIT=m 293CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m
351CONFIG_IP6_NF_MATCH_IPV6HEADER=m 366CONFIG_IP6_NF_MATCH_IPV6HEADER=m
352CONFIG_IP6_NF_MATCH_MH=m 367CONFIG_IP6_NF_MATCH_MH=m
353CONFIG_IP6_NF_MATCH_RT=m 368CONFIG_IP6_NF_MATCH_RT=m
369CONFIG_IP6_NF_TARGET_HL=m
354CONFIG_IP6_NF_TARGET_LOG=m 370CONFIG_IP6_NF_TARGET_LOG=m
355CONFIG_IP6_NF_FILTER=m 371CONFIG_IP6_NF_FILTER=m
356CONFIG_IP6_NF_TARGET_REJECT=m 372CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 373CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 374CONFIG_IP6_NF_RAW=m
360CONFIG_IP_DCCP=m 375CONFIG_IP_DCCP=m
361CONFIG_INET_DCCP_DIAG=m 376CONFIG_INET_DCCP_DIAG=m
362CONFIG_IP_DCCP_ACKVEC=y
363 377
364# 378#
365# DCCP CCIDs Configuration (EXPERIMENTAL) 379# DCCP CCIDs Configuration (EXPERIMENTAL)
366# 380#
367CONFIG_IP_DCCP_CCID2=m
368# CONFIG_IP_DCCP_CCID2_DEBUG is not set 381# CONFIG_IP_DCCP_CCID2_DEBUG is not set
369CONFIG_IP_DCCP_CCID3=m 382# CONFIG_IP_DCCP_CCID3 is not set
370# CONFIG_IP_DCCP_CCID3_DEBUG is not set
371CONFIG_IP_DCCP_CCID3_RTO=100
372CONFIG_IP_DCCP_TFRC_LIB=m
373CONFIG_IP_SCTP=m 383CONFIG_IP_SCTP=m
374# CONFIG_SCTP_DBG_MSG is not set 384# CONFIG_SCTP_DBG_MSG is not set
375# CONFIG_SCTP_DBG_OBJCNT is not set 385# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_IPDDP_DECAP=y
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -429,6 +441,7 @@ CONFIG_CONNECTOR=m
429# CONFIG_MTD is not set 441# CONFIG_MTD is not set
430# CONFIG_PARPORT is not set 442# CONFIG_PARPORT is not set
431CONFIG_BLK_DEV=y 443CONFIG_BLK_DEV=y
444CONFIG_BLK_DEV_SWIM=y
432# CONFIG_BLK_DEV_COW_COMMON is not set 445# CONFIG_BLK_DEV_COW_COMMON is not set
433CONFIG_BLK_DEV_LOOP=y 446CONFIG_BLK_DEV_LOOP=y
434CONFIG_BLK_DEV_CRYPTOLOOP=m 447CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -443,15 +456,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 456CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 457# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 458CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 459# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 460# CONFIG_C2PORT is not set
461
462#
463# EEPROM support
464#
465# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 466CONFIG_HAVE_IDE=y
450CONFIG_IDE=y 467CONFIG_IDE=y
451 468
452# 469#
453# Please see Documentation/ide/ide.txt for help/info on IDE drives 470# Please see Documentation/ide/ide.txt for help/info on IDE drives
454# 471#
472CONFIG_IDE_ATAPI=y
455# CONFIG_BLK_DEV_IDE_SATA is not set 473# CONFIG_BLK_DEV_IDE_SATA is not set
456CONFIG_IDE_GD=y 474CONFIG_IDE_GD=y
457CONFIG_IDE_GD_ATA=y 475CONFIG_IDE_GD_ATA=y
@@ -459,7 +477,6 @@ CONFIG_IDE_GD_ATA=y
459CONFIG_BLK_DEV_IDECD=y 477CONFIG_BLK_DEV_IDECD=y
460CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 478CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
461# CONFIG_BLK_DEV_IDETAPE is not set 479# CONFIG_BLK_DEV_IDETAPE is not set
462# CONFIG_BLK_DEV_IDESCSI is not set
463# CONFIG_IDE_TASK_IOCTL is not set 480# CONFIG_IDE_TASK_IOCTL is not set
464CONFIG_IDE_PROC_FS=y 481CONFIG_IDE_PROC_FS=y
465 482
@@ -514,10 +531,13 @@ CONFIG_SCSI_SRP_ATTRS=m
514CONFIG_SCSI_SRP_TGT_ATTRS=y 531CONFIG_SCSI_SRP_TGT_ATTRS=y
515CONFIG_SCSI_LOWLEVEL=y 532CONFIG_SCSI_LOWLEVEL=y
516CONFIG_ISCSI_TCP=m 533CONFIG_ISCSI_TCP=m
534# CONFIG_LIBFC is not set
535# CONFIG_LIBFCOE is not set
517# CONFIG_SCSI_DEBUG is not set 536# CONFIG_SCSI_DEBUG is not set
518CONFIG_MAC_SCSI=y 537CONFIG_MAC_SCSI=y
519CONFIG_SCSI_MAC_ESP=y 538CONFIG_SCSI_MAC_ESP=y
520# CONFIG_SCSI_DH is not set 539# CONFIG_SCSI_DH is not set
540# CONFIG_SCSI_OSD_INITIATOR is not set
521CONFIG_MD=y 541CONFIG_MD=y
522CONFIG_BLK_DEV_MD=m 542CONFIG_BLK_DEV_MD=m
523CONFIG_MD_LINEAR=m 543CONFIG_MD_LINEAR=m
@@ -525,7 +545,7 @@ CONFIG_MD_RAID0=m
525CONFIG_MD_RAID1=m 545CONFIG_MD_RAID1=m
526# CONFIG_MD_RAID10 is not set 546# CONFIG_MD_RAID10 is not set
527CONFIG_MD_RAID456=m 547CONFIG_MD_RAID456=m
528CONFIG_MD_RAID5_RESHAPE=y 548CONFIG_MD_RAID6_PQ=m
529# CONFIG_MD_MULTIPATH is not set 549# CONFIG_MD_MULTIPATH is not set
530# CONFIG_MD_FAULTY is not set 550# CONFIG_MD_FAULTY is not set
531CONFIG_BLK_DEV_DM=m 551CONFIG_BLK_DEV_DM=m
@@ -547,6 +567,7 @@ CONFIG_ADB_CUDA=y
547CONFIG_INPUT_ADBHID=y 567CONFIG_INPUT_ADBHID=y
548CONFIG_MAC_EMUMOUSEBTN=y 568CONFIG_MAC_EMUMOUSEBTN=y
549CONFIG_NETDEVICES=y 569CONFIG_NETDEVICES=y
570CONFIG_COMPAT_NET_DEV_OPS=y
550CONFIG_DUMMY=m 571CONFIG_DUMMY=m
551# CONFIG_BONDING is not set 572# CONFIG_BONDING is not set
552CONFIG_MACVLAN=m 573CONFIG_MACVLAN=m
@@ -561,6 +582,8 @@ CONFIG_MAC89x0=m
561CONFIG_MACSONIC=m 582CONFIG_MACSONIC=m
562CONFIG_MACMACE=y 583CONFIG_MACMACE=y
563# CONFIG_NET_VENDOR_SMC is not set 584# CONFIG_NET_VENDOR_SMC is not set
585# CONFIG_ETHOC is not set
586# CONFIG_DNET is not set
564# CONFIG_IBM_NEW_EMAC_ZMII is not set 587# CONFIG_IBM_NEW_EMAC_ZMII is not set
565# CONFIG_IBM_NEW_EMAC_RGMII is not set 588# CONFIG_IBM_NEW_EMAC_RGMII is not set
566# CONFIG_IBM_NEW_EMAC_TAH is not set 589# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -577,7 +600,10 @@ CONFIG_MACMACE=y
577# 600#
578# CONFIG_WLAN_PRE80211 is not set 601# CONFIG_WLAN_PRE80211 is not set
579# CONFIG_WLAN_80211 is not set 602# CONFIG_WLAN_80211 is not set
580# CONFIG_IWLWIFI_LEDS is not set 603
604#
605# Enable WiMAX (Networking options) to see the WiMAX drivers
606#
581# CONFIG_WAN is not set 607# CONFIG_WAN is not set
582CONFIG_PPP=m 608CONFIG_PPP=m
583# CONFIG_PPP_MULTILINK is not set 609# CONFIG_PPP_MULTILINK is not set
@@ -635,7 +661,6 @@ CONFIG_MOUSE_PS2=m
635CONFIG_MOUSE_PS2_ALPS=y 661CONFIG_MOUSE_PS2_ALPS=y
636CONFIG_MOUSE_PS2_LOGIPS2PP=y 662CONFIG_MOUSE_PS2_LOGIPS2PP=y
637CONFIG_MOUSE_PS2_SYNAPTICS=y 663CONFIG_MOUSE_PS2_SYNAPTICS=y
638CONFIG_MOUSE_PS2_LIFEBOOK=y
639CONFIG_MOUSE_PS2_TRACKPOINT=y 664CONFIG_MOUSE_PS2_TRACKPOINT=y
640# CONFIG_MOUSE_PS2_ELANTECH is not set 665# CONFIG_MOUSE_PS2_ELANTECH is not set
641# CONFIG_MOUSE_PS2_TOUCHKIT is not set 666# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -677,6 +702,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
677# Non-8250 serial port support 702# Non-8250 serial port support
678# 703#
679CONFIG_UNIX98_PTYS=y 704CONFIG_UNIX98_PTYS=y
705# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
680CONFIG_LEGACY_PTYS=y 706CONFIG_LEGACY_PTYS=y
681CONFIG_LEGACY_PTY_COUNT=256 707CONFIG_LEGACY_PTY_COUNT=256
682# CONFIG_IPMI_HANDLER is not set 708# CONFIG_IPMI_HANDLER is not set
@@ -760,6 +786,7 @@ CONFIG_FB_MAC=y
760# CONFIG_FB_VIRTUAL is not set 786# CONFIG_FB_VIRTUAL is not set
761# CONFIG_FB_METRONOME is not set 787# CONFIG_FB_METRONOME is not set
762# CONFIG_FB_MB862XX is not set 788# CONFIG_FB_MB862XX is not set
789# CONFIG_FB_BROADSHEET is not set
763# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 790# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
764 791
765# 792#
@@ -793,7 +820,6 @@ CONFIG_HIDRAW=y
793# 820#
794# Special HID drivers 821# Special HID drivers
795# 822#
796CONFIG_HID_COMPAT=y
797# CONFIG_USB_SUPPORT is not set 823# CONFIG_USB_SUPPORT is not set
798# CONFIG_MMC is not set 824# CONFIG_MMC is not set
799# CONFIG_MEMSTICK is not set 825# CONFIG_MEMSTICK is not set
@@ -801,9 +827,9 @@ CONFIG_HID_COMPAT=y
801# CONFIG_ACCESSIBILITY is not set 827# CONFIG_ACCESSIBILITY is not set
802# CONFIG_RTC_CLASS is not set 828# CONFIG_RTC_CLASS is not set
803# CONFIG_DMADEVICES is not set 829# CONFIG_DMADEVICES is not set
830# CONFIG_AUXDISPLAY is not set
804# CONFIG_UIO is not set 831# CONFIG_UIO is not set
805# CONFIG_STAGING is not set 832# CONFIG_STAGING is not set
806CONFIG_STAGING_EXCLUDE_BUILD=y
807 833
808# 834#
809# Character devices 835# Character devices
@@ -819,6 +845,7 @@ CONFIG_EXT2_FS=y
819# CONFIG_EXT2_FS_XATTR is not set 845# CONFIG_EXT2_FS_XATTR is not set
820# CONFIG_EXT2_FS_XIP is not set 846# CONFIG_EXT2_FS_XIP is not set
821CONFIG_EXT3_FS=y 847CONFIG_EXT3_FS=y
848# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
822# CONFIG_EXT3_FS_XATTR is not set 849# CONFIG_EXT3_FS_XATTR is not set
823# CONFIG_EXT4_FS is not set 850# CONFIG_EXT4_FS is not set
824CONFIG_JBD=y 851CONFIG_JBD=y
@@ -845,13 +872,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
845# CONFIG_OCFS2_FS_STATS is not set 872# CONFIG_OCFS2_FS_STATS is not set
846# CONFIG_OCFS2_DEBUG_MASKLOG is not set 873# CONFIG_OCFS2_DEBUG_MASKLOG is not set
847# CONFIG_OCFS2_DEBUG_FS is not set 874# CONFIG_OCFS2_DEBUG_FS is not set
848# CONFIG_OCFS2_COMPAT_JBD is not set 875# CONFIG_OCFS2_FS_POSIX_ACL is not set
876# CONFIG_BTRFS_FS is not set
849CONFIG_DNOTIFY=y 877CONFIG_DNOTIFY=y
850CONFIG_INOTIFY=y 878CONFIG_INOTIFY=y
851CONFIG_INOTIFY_USER=y 879CONFIG_INOTIFY_USER=y
852CONFIG_QUOTA=y 880CONFIG_QUOTA=y
853CONFIG_QUOTA_NETLINK_INTERFACE=y 881CONFIG_QUOTA_NETLINK_INTERFACE=y
854# CONFIG_PRINT_QUOTA_WARNING is not set 882# CONFIG_PRINT_QUOTA_WARNING is not set
883CONFIG_QUOTA_TREE=m
855# CONFIG_QFMT_V1 is not set 884# CONFIG_QFMT_V1 is not set
856# CONFIG_QFMT_V2 is not set 885# CONFIG_QFMT_V2 is not set
857CONFIG_QUOTACTL=y 886CONFIG_QUOTACTL=y
@@ -860,6 +889,11 @@ CONFIG_AUTOFS4_FS=m
860CONFIG_FUSE_FS=m 889CONFIG_FUSE_FS=m
861 890
862# 891#
892# Caches
893#
894# CONFIG_FSCACHE is not set
895
896#
863# CD-ROM/DVD Filesystems 897# CD-ROM/DVD Filesystems
864# 898#
865CONFIG_ISO9660_FS=y 899CONFIG_ISO9660_FS=y
@@ -890,10 +924,7 @@ CONFIG_TMPFS=y
890# CONFIG_TMPFS_POSIX_ACL is not set 924# CONFIG_TMPFS_POSIX_ACL is not set
891# CONFIG_HUGETLB_PAGE is not set 925# CONFIG_HUGETLB_PAGE is not set
892CONFIG_CONFIGFS_FS=m 926CONFIG_CONFIGFS_FS=m
893 927CONFIG_MISC_FILESYSTEMS=y
894#
895# Miscellaneous filesystems
896#
897# CONFIG_ADFS_FS is not set 928# CONFIG_ADFS_FS is not set
898CONFIG_AFFS_FS=m 929CONFIG_AFFS_FS=m
899CONFIG_HFS_FS=y 930CONFIG_HFS_FS=y
@@ -902,6 +933,9 @@ CONFIG_HFSPLUS_FS=y
902# CONFIG_BFS_FS is not set 933# CONFIG_BFS_FS is not set
903# CONFIG_EFS_FS is not set 934# CONFIG_EFS_FS is not set
904CONFIG_CRAMFS=m 935CONFIG_CRAMFS=m
936CONFIG_SQUASHFS=m
937# CONFIG_SQUASHFS_EMBEDDED is not set
938CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
905# CONFIG_VXFS_FS is not set 939# CONFIG_VXFS_FS is not set
906CONFIG_MINIX_FS=y 940CONFIG_MINIX_FS=y
907# CONFIG_OMFS_FS is not set 941# CONFIG_OMFS_FS is not set
@@ -912,6 +946,7 @@ CONFIG_SYSV_FS=m
912CONFIG_UFS_FS=m 946CONFIG_UFS_FS=m
913# CONFIG_UFS_FS_WRITE is not set 947# CONFIG_UFS_FS_WRITE is not set
914# CONFIG_UFS_DEBUG is not set 948# CONFIG_UFS_DEBUG is not set
949# CONFIG_NILFS2_FS is not set
915CONFIG_NETWORK_FILESYSTEMS=y 950CONFIG_NETWORK_FILESYSTEMS=y
916CONFIG_NFS_FS=m 951CONFIG_NFS_FS=m
917CONFIG_NFS_V3=y 952CONFIG_NFS_V3=y
@@ -927,7 +962,6 @@ CONFIG_EXPORTFS=m
927CONFIG_NFS_COMMON=y 962CONFIG_NFS_COMMON=y
928CONFIG_SUNRPC=m 963CONFIG_SUNRPC=m
929CONFIG_SUNRPC_GSS=m 964CONFIG_SUNRPC_GSS=m
930# CONFIG_SUNRPC_REGISTER_V4 is not set
931CONFIG_RPCSEC_GSS_KRB5=m 965CONFIG_RPCSEC_GSS_KRB5=m
932# CONFIG_RPCSEC_GSS_SPKM3 is not set 966# CONFIG_RPCSEC_GSS_SPKM3 is not set
933CONFIG_SMB_FS=m 967CONFIG_SMB_FS=m
@@ -1003,11 +1037,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1003CONFIG_DEBUG_MEMORY_INIT=y 1037CONFIG_DEBUG_MEMORY_INIT=y
1004# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1038# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1005CONFIG_SYSCTL_SYSCALL_CHECK=y 1039CONFIG_SYSCTL_SYSCALL_CHECK=y
1006
1007#
1008# Tracers
1009#
1010# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1011# CONFIG_SAMPLES is not set 1040# CONFIG_SAMPLES is not set
1012 1041
1013# 1042#
@@ -1028,13 +1057,21 @@ CONFIG_CRYPTO=y
1028# 1057#
1029# CONFIG_CRYPTO_FIPS is not set 1058# CONFIG_CRYPTO_FIPS is not set
1030CONFIG_CRYPTO_ALGAPI=y 1059CONFIG_CRYPTO_ALGAPI=y
1031CONFIG_CRYPTO_AEAD=y 1060CONFIG_CRYPTO_ALGAPI2=y
1032CONFIG_CRYPTO_BLKCIPHER=y 1061CONFIG_CRYPTO_AEAD=m
1062CONFIG_CRYPTO_AEAD2=y
1063CONFIG_CRYPTO_BLKCIPHER=m
1064CONFIG_CRYPTO_BLKCIPHER2=y
1033CONFIG_CRYPTO_HASH=y 1065CONFIG_CRYPTO_HASH=y
1034CONFIG_CRYPTO_RNG=y 1066CONFIG_CRYPTO_HASH2=y
1067CONFIG_CRYPTO_RNG=m
1068CONFIG_CRYPTO_RNG2=y
1069CONFIG_CRYPTO_PCOMP=y
1035CONFIG_CRYPTO_MANAGER=y 1070CONFIG_CRYPTO_MANAGER=y
1071CONFIG_CRYPTO_MANAGER2=y
1036CONFIG_CRYPTO_GF128MUL=m 1072CONFIG_CRYPTO_GF128MUL=m
1037CONFIG_CRYPTO_NULL=m 1073CONFIG_CRYPTO_NULL=m
1074CONFIG_CRYPTO_WORKQUEUE=y
1038CONFIG_CRYPTO_CRYPTD=m 1075CONFIG_CRYPTO_CRYPTD=m
1039CONFIG_CRYPTO_AUTHENC=m 1076CONFIG_CRYPTO_AUTHENC=m
1040CONFIG_CRYPTO_TEST=m 1077CONFIG_CRYPTO_TEST=m
@@ -1104,6 +1141,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1104# Compression 1141# Compression
1105# 1142#
1106CONFIG_CRYPTO_DEFLATE=m 1143CONFIG_CRYPTO_DEFLATE=m
1144CONFIG_CRYPTO_ZLIB=m
1107CONFIG_CRYPTO_LZO=m 1145CONFIG_CRYPTO_LZO=m
1108 1146
1109# 1147#
@@ -1111,11 +1149,13 @@ CONFIG_CRYPTO_LZO=m
1111# 1149#
1112# CONFIG_CRYPTO_ANSI_CPRNG is not set 1150# CONFIG_CRYPTO_ANSI_CPRNG is not set
1113# CONFIG_CRYPTO_HW is not set 1151# CONFIG_CRYPTO_HW is not set
1152# CONFIG_BINARY_PRINTF is not set
1114 1153
1115# 1154#
1116# Library routines 1155# Library routines
1117# 1156#
1118CONFIG_BITREVERSE=y 1157CONFIG_BITREVERSE=y
1158CONFIG_GENERIC_FIND_LAST_BIT=y
1119CONFIG_CRC_CCITT=m 1159CONFIG_CRC_CCITT=m
1120CONFIG_CRC16=m 1160CONFIG_CRC16=m
1121CONFIG_CRC_T10DIF=y 1161CONFIG_CRC_T10DIF=y
@@ -1127,10 +1167,13 @@ CONFIG_ZLIB_INFLATE=y
1127CONFIG_ZLIB_DEFLATE=m 1167CONFIG_ZLIB_DEFLATE=m
1128CONFIG_LZO_COMPRESS=m 1168CONFIG_LZO_COMPRESS=m
1129CONFIG_LZO_DECOMPRESS=m 1169CONFIG_LZO_DECOMPRESS=m
1170CONFIG_DECOMPRESS_GZIP=y
1171CONFIG_DECOMPRESS_BZIP2=y
1172CONFIG_DECOMPRESS_LZMA=y
1130CONFIG_TEXTSEARCH=y 1173CONFIG_TEXTSEARCH=y
1131CONFIG_TEXTSEARCH_KMP=m 1174CONFIG_TEXTSEARCH_KMP=m
1132CONFIG_TEXTSEARCH_BM=m 1175CONFIG_TEXTSEARCH_BM=m
1133CONFIG_TEXTSEARCH_FSM=m 1176CONFIG_TEXTSEARCH_FSM=m
1134CONFIG_PLIST=y
1135CONFIG_HAS_IOMEM=y 1177CONFIG_HAS_IOMEM=y
1136CONFIG_HAS_DMA=y 1178CONFIG_HAS_DMA=y
1179CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 70693588031e..69c43e2d8b45 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:48 2008 4# Wed Apr 22 20:48:06 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -146,12 +157,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
146CONFIG_NEED_MULTIPLE_NODES=y 157CONFIG_NEED_MULTIPLE_NODES=y
147CONFIG_PAGEFLAGS_EXTENDED=y 158CONFIG_PAGEFLAGS_EXTENDED=y
148CONFIG_SPLIT_PTLOCK_CPUS=4 159CONFIG_SPLIT_PTLOCK_CPUS=4
149# CONFIG_RESOURCES_64BIT is not set
150# CONFIG_PHYS_ADDR_T_64BIT is not set 160# CONFIG_PHYS_ADDR_T_64BIT is not set
151CONFIG_ZONE_DMA_FLAG=1 161CONFIG_ZONE_DMA_FLAG=1
152CONFIG_BOUNCE=y 162CONFIG_BOUNCE=y
153CONFIG_VIRT_TO_BUS=y 163CONFIG_VIRT_TO_BUS=y
154CONFIG_UNEVICTABLE_LRU=y 164CONFIG_UNEVICTABLE_LRU=y
165CONFIG_HAVE_MLOCK=y
166CONFIG_HAVE_MLOCKED_PAGE_BIT=y
155 167
156# 168#
157# General setup 169# General setup
@@ -268,6 +280,7 @@ CONFIG_NETFILTER_XTABLES=m
268CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 280CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
269CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 281CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
270CONFIG_NETFILTER_XT_TARGET_DSCP=m 282CONFIG_NETFILTER_XT_TARGET_DSCP=m
283CONFIG_NETFILTER_XT_TARGET_HL=m
271CONFIG_NETFILTER_XT_TARGET_MARK=m 284CONFIG_NETFILTER_XT_TARGET_MARK=m
272CONFIG_NETFILTER_XT_TARGET_NFLOG=m 285CONFIG_NETFILTER_XT_TARGET_NFLOG=m
273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 286CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -276,6 +289,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
276CONFIG_NETFILTER_XT_TARGET_TRACE=m 289CONFIG_NETFILTER_XT_TARGET_TRACE=m
277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 290CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 291CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
292CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
279CONFIG_NETFILTER_XT_MATCH_COMMENT=m 293CONFIG_NETFILTER_XT_MATCH_COMMENT=m
280CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 294CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
281CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 295CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -286,6 +300,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
286CONFIG_NETFILTER_XT_MATCH_ESP=m 300CONFIG_NETFILTER_XT_MATCH_ESP=m
287CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 301CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
288CONFIG_NETFILTER_XT_MATCH_HELPER=m 302CONFIG_NETFILTER_XT_MATCH_HELPER=m
303CONFIG_NETFILTER_XT_MATCH_HL=m
289CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 304CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
290CONFIG_NETFILTER_XT_MATCH_LENGTH=m 305CONFIG_NETFILTER_XT_MATCH_LENGTH=m
291CONFIG_NETFILTER_XT_MATCH_LIMIT=m 306CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -364,25 +379,20 @@ CONFIG_IP6_NF_MATCH_HL=m
364CONFIG_IP6_NF_MATCH_IPV6HEADER=m 379CONFIG_IP6_NF_MATCH_IPV6HEADER=m
365CONFIG_IP6_NF_MATCH_MH=m 380CONFIG_IP6_NF_MATCH_MH=m
366CONFIG_IP6_NF_MATCH_RT=m 381CONFIG_IP6_NF_MATCH_RT=m
382CONFIG_IP6_NF_TARGET_HL=m
367CONFIG_IP6_NF_TARGET_LOG=m 383CONFIG_IP6_NF_TARGET_LOG=m
368CONFIG_IP6_NF_FILTER=m 384CONFIG_IP6_NF_FILTER=m
369CONFIG_IP6_NF_TARGET_REJECT=m 385CONFIG_IP6_NF_TARGET_REJECT=m
370CONFIG_IP6_NF_MANGLE=m 386CONFIG_IP6_NF_MANGLE=m
371CONFIG_IP6_NF_TARGET_HL=m
372CONFIG_IP6_NF_RAW=m 387CONFIG_IP6_NF_RAW=m
373CONFIG_IP_DCCP=m 388CONFIG_IP_DCCP=m
374CONFIG_INET_DCCP_DIAG=m 389CONFIG_INET_DCCP_DIAG=m
375CONFIG_IP_DCCP_ACKVEC=y
376 390
377# 391#
378# DCCP CCIDs Configuration (EXPERIMENTAL) 392# DCCP CCIDs Configuration (EXPERIMENTAL)
379# 393#
380CONFIG_IP_DCCP_CCID2=m
381# CONFIG_IP_DCCP_CCID2_DEBUG is not set 394# CONFIG_IP_DCCP_CCID2_DEBUG is not set
382CONFIG_IP_DCCP_CCID3=m 395# CONFIG_IP_DCCP_CCID3 is not set
383# CONFIG_IP_DCCP_CCID3_DEBUG is not set
384CONFIG_IP_DCCP_CCID3_RTO=100
385CONFIG_IP_DCCP_TFRC_LIB=m
386CONFIG_IP_SCTP=m 396CONFIG_IP_SCTP=m
387# CONFIG_SCTP_DBG_MSG is not set 397# CONFIG_SCTP_DBG_MSG is not set
388# CONFIG_SCTP_DBG_OBJCNT is not set 398# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -408,8 +418,10 @@ CONFIG_IPDDP_DECAP=y
408# CONFIG_LAPB is not set 418# CONFIG_LAPB is not set
409# CONFIG_ECONET is not set 419# CONFIG_ECONET is not set
410# CONFIG_WAN_ROUTER is not set 420# CONFIG_WAN_ROUTER is not set
421# CONFIG_PHONET is not set
411# CONFIG_NET_SCHED is not set 422# CONFIG_NET_SCHED is not set
412CONFIG_NET_CLS_ROUTE=y 423CONFIG_NET_CLS_ROUTE=y
424# CONFIG_DCB is not set
413 425
414# 426#
415# Network testing 427# Network testing
@@ -420,8 +432,8 @@ CONFIG_NET_CLS_ROUTE=y
420# CONFIG_IRDA is not set 432# CONFIG_IRDA is not set
421# CONFIG_BT is not set 433# CONFIG_BT is not set
422# CONFIG_AF_RXRPC is not set 434# CONFIG_AF_RXRPC is not set
423# CONFIG_PHONET is not set
424# CONFIG_WIRELESS is not set 435# CONFIG_WIRELESS is not set
436# CONFIG_WIMAX is not set
425# CONFIG_RFKILL is not set 437# CONFIG_RFKILL is not set
426# CONFIG_NET_9P is not set 438# CONFIG_NET_9P is not set
427 439
@@ -454,6 +466,7 @@ CONFIG_PARPORT_NOT_PC=y
454CONFIG_BLK_DEV=y 466CONFIG_BLK_DEV=y
455CONFIG_AMIGA_FLOPPY=y 467CONFIG_AMIGA_FLOPPY=y
456CONFIG_ATARI_FLOPPY=y 468CONFIG_ATARI_FLOPPY=y
469CONFIG_BLK_DEV_SWIM=y
457CONFIG_AMIGA_Z2RAM=y 470CONFIG_AMIGA_Z2RAM=y
458# CONFIG_BLK_DEV_COW_COMMON is not set 471# CONFIG_BLK_DEV_COW_COMMON is not set
459CONFIG_BLK_DEV_LOOP=y 472CONFIG_BLK_DEV_LOOP=y
@@ -469,15 +482,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
469CONFIG_ATA_OVER_ETH=m 482CONFIG_ATA_OVER_ETH=m
470# CONFIG_BLK_DEV_HD is not set 483# CONFIG_BLK_DEV_HD is not set
471CONFIG_MISC_DEVICES=y 484CONFIG_MISC_DEVICES=y
472# CONFIG_EEPROM_93CX6 is not set
473# CONFIG_ENCLOSURE_SERVICES is not set 485# CONFIG_ENCLOSURE_SERVICES is not set
474# CONFIG_C2PORT is not set 486# CONFIG_C2PORT is not set
487
488#
489# EEPROM support
490#
491# CONFIG_EEPROM_93CX6 is not set
475CONFIG_HAVE_IDE=y 492CONFIG_HAVE_IDE=y
476CONFIG_IDE=y 493CONFIG_IDE=y
477 494
478# 495#
479# Please see Documentation/ide/ide.txt for help/info on IDE drives 496# Please see Documentation/ide/ide.txt for help/info on IDE drives
480# 497#
498CONFIG_IDE_ATAPI=y
481# CONFIG_BLK_DEV_IDE_SATA is not set 499# CONFIG_BLK_DEV_IDE_SATA is not set
482CONFIG_IDE_GD=y 500CONFIG_IDE_GD=y
483CONFIG_IDE_GD_ATA=y 501CONFIG_IDE_GD_ATA=y
@@ -485,7 +503,6 @@ CONFIG_IDE_GD_ATA=y
485CONFIG_BLK_DEV_IDECD=y 503CONFIG_BLK_DEV_IDECD=y
486CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 504CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
487# CONFIG_BLK_DEV_IDETAPE is not set 505# CONFIG_BLK_DEV_IDETAPE is not set
488# CONFIG_BLK_DEV_IDESCSI is not set
489# CONFIG_IDE_TASK_IOCTL is not set 506# CONFIG_IDE_TASK_IOCTL is not set
490CONFIG_IDE_PROC_FS=y 507CONFIG_IDE_PROC_FS=y
491 508
@@ -494,7 +511,6 @@ CONFIG_IDE_PROC_FS=y
494# 511#
495# CONFIG_BLK_DEV_PLATFORM is not set 512# CONFIG_BLK_DEV_PLATFORM is not set
496CONFIG_BLK_DEV_GAYLE=y 513CONFIG_BLK_DEV_GAYLE=y
497CONFIG_BLK_DEV_IDEDOUBLER=y
498CONFIG_BLK_DEV_BUDDHA=y 514CONFIG_BLK_DEV_BUDDHA=y
499CONFIG_BLK_DEV_FALCON_IDE=y 515CONFIG_BLK_DEV_FALCON_IDE=y
500CONFIG_BLK_DEV_MAC_IDE=y 516CONFIG_BLK_DEV_MAC_IDE=y
@@ -549,6 +565,8 @@ CONFIG_ISCSI_TCP=m
549# CONFIG_SCSI_AIC7XXX_OLD is not set 565# CONFIG_SCSI_AIC7XXX_OLD is not set
550# CONFIG_SCSI_ADVANSYS is not set 566# CONFIG_SCSI_ADVANSYS is not set
551# CONFIG_SCSI_IN2000 is not set 567# CONFIG_SCSI_IN2000 is not set
568# CONFIG_LIBFC is not set
569# CONFIG_LIBFCOE is not set
552# CONFIG_SCSI_DTC3280 is not set 570# CONFIG_SCSI_DTC3280 is not set
553# CONFIG_SCSI_FUTURE_DOMAIN is not set 571# CONFIG_SCSI_FUTURE_DOMAIN is not set
554# CONFIG_SCSI_GENERIC_NCR5380 is not set 572# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -575,6 +593,7 @@ CONFIG_MVME16x_SCSI=y
575CONFIG_BVME6000_SCSI=y 593CONFIG_BVME6000_SCSI=y
576CONFIG_SUN3X_ESP=y 594CONFIG_SUN3X_ESP=y
577# CONFIG_SCSI_DH is not set 595# CONFIG_SCSI_DH is not set
596# CONFIG_SCSI_OSD_INITIATOR is not set
578CONFIG_MD=y 597CONFIG_MD=y
579CONFIG_BLK_DEV_MD=m 598CONFIG_BLK_DEV_MD=m
580CONFIG_MD_LINEAR=m 599CONFIG_MD_LINEAR=m
@@ -582,7 +601,7 @@ CONFIG_MD_RAID0=m
582CONFIG_MD_RAID1=m 601CONFIG_MD_RAID1=m
583# CONFIG_MD_RAID10 is not set 602# CONFIG_MD_RAID10 is not set
584CONFIG_MD_RAID456=m 603CONFIG_MD_RAID456=m
585CONFIG_MD_RAID5_RESHAPE=y 604CONFIG_MD_RAID6_PQ=m
586# CONFIG_MD_MULTIPATH is not set 605# CONFIG_MD_MULTIPATH is not set
587# CONFIG_MD_FAULTY is not set 606# CONFIG_MD_FAULTY is not set
588CONFIG_BLK_DEV_DM=m 607CONFIG_BLK_DEV_DM=m
@@ -604,6 +623,7 @@ CONFIG_ADB_CUDA=y
604CONFIG_INPUT_ADBHID=y 623CONFIG_INPUT_ADBHID=y
605CONFIG_MAC_EMUMOUSEBTN=y 624CONFIG_MAC_EMUMOUSEBTN=y
606CONFIG_NETDEVICES=y 625CONFIG_NETDEVICES=y
626CONFIG_COMPAT_NET_DEV_OPS=y
607CONFIG_DUMMY=m 627CONFIG_DUMMY=m
608# CONFIG_BONDING is not set 628# CONFIG_BONDING is not set
609CONFIG_MACVLAN=m 629CONFIG_MACVLAN=m
@@ -614,24 +634,26 @@ CONFIG_VETH=m
614# CONFIG_PHYLIB is not set 634# CONFIG_PHYLIB is not set
615CONFIG_NET_ETHERNET=y 635CONFIG_NET_ETHERNET=y
616CONFIG_MII=y 636CONFIG_MII=y
617CONFIG_ARIADNE=m 637CONFIG_ARIADNE=y
618CONFIG_A2065=m 638CONFIG_A2065=y
619CONFIG_HYDRA=m 639CONFIG_HYDRA=y
620CONFIG_ZORRO8390=m 640CONFIG_ZORRO8390=y
621CONFIG_APNE=m 641CONFIG_APNE=y
622CONFIG_MAC8390=y 642CONFIG_MAC8390=y
623CONFIG_MAC89x0=m 643CONFIG_MAC89x0=y
624CONFIG_MACSONIC=m 644CONFIG_MACSONIC=y
625CONFIG_MACMACE=y 645CONFIG_MACMACE=y
626CONFIG_MVME147_NET=y 646CONFIG_MVME147_NET=y
627CONFIG_MVME16x_NET=y 647CONFIG_MVME16x_NET=y
628CONFIG_BVME6000_NET=y 648CONFIG_BVME6000_NET=y
629CONFIG_ATARILANCE=m 649CONFIG_ATARILANCE=y
630CONFIG_SUN3LANCE=y 650CONFIG_SUN3LANCE=y
631CONFIG_HPLANCE=y 651CONFIG_HPLANCE=y
632# CONFIG_NET_VENDOR_3COM is not set 652# CONFIG_NET_VENDOR_3COM is not set
633# CONFIG_NET_VENDOR_SMC is not set 653# CONFIG_NET_VENDOR_SMC is not set
654# CONFIG_ETHOC is not set
634# CONFIG_NET_VENDOR_RACAL is not set 655# CONFIG_NET_VENDOR_RACAL is not set
656# CONFIG_DNET is not set
635# CONFIG_AT1700 is not set 657# CONFIG_AT1700 is not set
636# CONFIG_DEPCA is not set 658# CONFIG_DEPCA is not set
637# CONFIG_HP100 is not set 659# CONFIG_HP100 is not set
@@ -657,7 +679,10 @@ CONFIG_NE2000=m
657# 679#
658# CONFIG_WLAN_PRE80211 is not set 680# CONFIG_WLAN_PRE80211 is not set
659# CONFIG_WLAN_80211 is not set 681# CONFIG_WLAN_80211 is not set
660# CONFIG_IWLWIFI_LEDS is not set 682
683#
684# Enable WiMAX (Networking options) to see the WiMAX drivers
685#
661# CONFIG_WAN is not set 686# CONFIG_WAN is not set
662# CONFIG_PLIP is not set 687# CONFIG_PLIP is not set
663CONFIG_PPP=m 688CONFIG_PPP=m
@@ -717,11 +742,10 @@ CONFIG_KEYBOARD_ATARI=y
717CONFIG_KEYBOARD_HIL_OLD=y 742CONFIG_KEYBOARD_HIL_OLD=y
718CONFIG_KEYBOARD_HIL=y 743CONFIG_KEYBOARD_HIL=y
719CONFIG_INPUT_MOUSE=y 744CONFIG_INPUT_MOUSE=y
720CONFIG_MOUSE_PS2=y 745CONFIG_MOUSE_PS2=m
721CONFIG_MOUSE_PS2_ALPS=y 746CONFIG_MOUSE_PS2_ALPS=y
722CONFIG_MOUSE_PS2_LOGIPS2PP=y 747CONFIG_MOUSE_PS2_LOGIPS2PP=y
723CONFIG_MOUSE_PS2_SYNAPTICS=y 748CONFIG_MOUSE_PS2_SYNAPTICS=y
724CONFIG_MOUSE_PS2_LIFEBOOK=y
725CONFIG_MOUSE_PS2_TRACKPOINT=y 749CONFIG_MOUSE_PS2_TRACKPOINT=y
726# CONFIG_MOUSE_PS2_ELANTECH is not set 750# CONFIG_MOUSE_PS2_ELANTECH is not set
727# CONFIG_MOUSE_PS2_TOUCHKIT is not set 751# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -732,7 +756,7 @@ CONFIG_MOUSE_SERIAL=m
732CONFIG_MOUSE_AMIGA=m 756CONFIG_MOUSE_AMIGA=m
733CONFIG_MOUSE_ATARI=m 757CONFIG_MOUSE_ATARI=m
734# CONFIG_MOUSE_VSXXXAA is not set 758# CONFIG_MOUSE_VSXXXAA is not set
735CONFIG_MOUSE_HIL=m 759CONFIG_MOUSE_HIL=y
736CONFIG_INPUT_JOYSTICK=y 760CONFIG_INPUT_JOYSTICK=y
737# CONFIG_JOYSTICK_ANALOG is not set 761# CONFIG_JOYSTICK_ANALOG is not set
738# CONFIG_JOYSTICK_A3D is not set 762# CONFIG_JOYSTICK_A3D is not set
@@ -763,18 +787,18 @@ CONFIG_JOYSTICK_AMIGA=m
763CONFIG_INPUT_MISC=y 787CONFIG_INPUT_MISC=y
764CONFIG_INPUT_M68K_BEEP=m 788CONFIG_INPUT_M68K_BEEP=m
765# CONFIG_INPUT_UINPUT is not set 789# CONFIG_INPUT_UINPUT is not set
766CONFIG_HP_SDC_RTC=m 790CONFIG_HP_SDC_RTC=y
767 791
768# 792#
769# Hardware I/O ports 793# Hardware I/O ports
770# 794#
771CONFIG_SERIO=y 795CONFIG_SERIO=y
772# CONFIG_SERIO_SERPORT is not set 796# CONFIG_SERIO_SERPORT is not set
773CONFIG_SERIO_Q40KBD=m 797CONFIG_SERIO_Q40KBD=y
774# CONFIG_SERIO_PARKBD is not set 798# CONFIG_SERIO_PARKBD is not set
775CONFIG_HP_SDC=y 799CONFIG_HP_SDC=y
776CONFIG_HIL_MLC=y 800CONFIG_HIL_MLC=y
777CONFIG_SERIO_LIBPS2=y 801CONFIG_SERIO_LIBPS2=m
778# CONFIG_SERIO_RAW is not set 802# CONFIG_SERIO_RAW is not set
779# CONFIG_GAMEPORT is not set 803# CONFIG_GAMEPORT is not set
780 804
@@ -788,7 +812,7 @@ CONFIG_HW_CONSOLE=y
788CONFIG_VT_HW_CONSOLE_BINDING=y 812CONFIG_VT_HW_CONSOLE_BINDING=y
789# CONFIG_DEVKMEM is not set 813# CONFIG_DEVKMEM is not set
790# CONFIG_SERIAL_NONSTANDARD is not set 814# CONFIG_SERIAL_NONSTANDARD is not set
791CONFIG_A2232=m 815CONFIG_A2232=y
792 816
793# 817#
794# Serial drivers 818# Serial drivers
@@ -799,6 +823,7 @@ CONFIG_A2232=m
799# Non-8250 serial port support 823# Non-8250 serial port support
800# 824#
801CONFIG_UNIX98_PTYS=y 825CONFIG_UNIX98_PTYS=y
826# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
802CONFIG_LEGACY_PTYS=y 827CONFIG_LEGACY_PTYS=y
803CONFIG_LEGACY_PTY_COUNT=256 828CONFIG_LEGACY_PTY_COUNT=256
804CONFIG_PRINTER=m 829CONFIG_PRINTER=m
@@ -807,7 +832,7 @@ CONFIG_PRINTER=m
807# CONFIG_IPMI_HANDLER is not set 832# CONFIG_IPMI_HANDLER is not set
808# CONFIG_HW_RANDOM is not set 833# CONFIG_HW_RANDOM is not set
809CONFIG_NVRAM=y 834CONFIG_NVRAM=y
810CONFIG_GEN_RTC=m 835CONFIG_GEN_RTC=y
811CONFIG_GEN_RTC_X=y 836CONFIG_GEN_RTC_X=y
812# CONFIG_DTLK is not set 837# CONFIG_DTLK is not set
813# CONFIG_R3964 is not set 838# CONFIG_R3964 is not set
@@ -898,6 +923,7 @@ CONFIG_FB_HP300=y
898# CONFIG_FB_VIRTUAL is not set 923# CONFIG_FB_VIRTUAL is not set
899# CONFIG_FB_METRONOME is not set 924# CONFIG_FB_METRONOME is not set
900# CONFIG_FB_MB862XX is not set 925# CONFIG_FB_MB862XX is not set
926# CONFIG_FB_BROADSHEET is not set
901# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 927# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
902 928
903# 929#
@@ -937,7 +963,6 @@ CONFIG_HIDRAW=y
937# 963#
938# Special HID drivers 964# Special HID drivers
939# 965#
940CONFIG_HID_COMPAT=y
941# CONFIG_USB_SUPPORT is not set 966# CONFIG_USB_SUPPORT is not set
942# CONFIG_MMC is not set 967# CONFIG_MMC is not set
943# CONFIG_MEMSTICK is not set 968# CONFIG_MEMSTICK is not set
@@ -948,13 +973,12 @@ CONFIG_HID_COMPAT=y
948# CONFIG_AUXDISPLAY is not set 973# CONFIG_AUXDISPLAY is not set
949# CONFIG_UIO is not set 974# CONFIG_UIO is not set
950# CONFIG_STAGING is not set 975# CONFIG_STAGING is not set
951CONFIG_STAGING_EXCLUDE_BUILD=y
952 976
953# 977#
954# Character devices 978# Character devices
955# 979#
956CONFIG_ATARI_MFPSER=m 980CONFIG_ATARI_MFPSER=y
957CONFIG_ATARI_MIDI=m 981CONFIG_ATARI_MIDI=y
958CONFIG_ATARI_DSP56K=m 982CONFIG_ATARI_DSP56K=m
959CONFIG_AMIGA_BUILTIN_SERIAL=y 983CONFIG_AMIGA_BUILTIN_SERIAL=y
960CONFIG_MULTIFACE_III_TTY=m 984CONFIG_MULTIFACE_III_TTY=m
@@ -974,6 +998,7 @@ CONFIG_EXT2_FS=y
974# CONFIG_EXT2_FS_XATTR is not set 998# CONFIG_EXT2_FS_XATTR is not set
975# CONFIG_EXT2_FS_XIP is not set 999# CONFIG_EXT2_FS_XIP is not set
976CONFIG_EXT3_FS=y 1000CONFIG_EXT3_FS=y
1001# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
977# CONFIG_EXT3_FS_XATTR is not set 1002# CONFIG_EXT3_FS_XATTR is not set
978# CONFIG_EXT4_FS is not set 1003# CONFIG_EXT4_FS is not set
979CONFIG_JBD=y 1004CONFIG_JBD=y
@@ -1000,13 +1025,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
1000# CONFIG_OCFS2_FS_STATS is not set 1025# CONFIG_OCFS2_FS_STATS is not set
1001# CONFIG_OCFS2_DEBUG_MASKLOG is not set 1026# CONFIG_OCFS2_DEBUG_MASKLOG is not set
1002# CONFIG_OCFS2_DEBUG_FS is not set 1027# CONFIG_OCFS2_DEBUG_FS is not set
1003# CONFIG_OCFS2_COMPAT_JBD is not set 1028# CONFIG_OCFS2_FS_POSIX_ACL is not set
1029# CONFIG_BTRFS_FS is not set
1004CONFIG_DNOTIFY=y 1030CONFIG_DNOTIFY=y
1005CONFIG_INOTIFY=y 1031CONFIG_INOTIFY=y
1006CONFIG_INOTIFY_USER=y 1032CONFIG_INOTIFY_USER=y
1007CONFIG_QUOTA=y 1033CONFIG_QUOTA=y
1008CONFIG_QUOTA_NETLINK_INTERFACE=y 1034CONFIG_QUOTA_NETLINK_INTERFACE=y
1009# CONFIG_PRINT_QUOTA_WARNING is not set 1035# CONFIG_PRINT_QUOTA_WARNING is not set
1036CONFIG_QUOTA_TREE=m
1010# CONFIG_QFMT_V1 is not set 1037# CONFIG_QFMT_V1 is not set
1011# CONFIG_QFMT_V2 is not set 1038# CONFIG_QFMT_V2 is not set
1012CONFIG_QUOTACTL=y 1039CONFIG_QUOTACTL=y
@@ -1015,6 +1042,11 @@ CONFIG_AUTOFS4_FS=m
1015CONFIG_FUSE_FS=m 1042CONFIG_FUSE_FS=m
1016 1043
1017# 1044#
1045# Caches
1046#
1047# CONFIG_FSCACHE is not set
1048
1049#
1018# CD-ROM/DVD Filesystems 1050# CD-ROM/DVD Filesystems
1019# 1051#
1020CONFIG_ISO9660_FS=y 1052CONFIG_ISO9660_FS=y
@@ -1045,10 +1077,7 @@ CONFIG_TMPFS=y
1045# CONFIG_TMPFS_POSIX_ACL is not set 1077# CONFIG_TMPFS_POSIX_ACL is not set
1046# CONFIG_HUGETLB_PAGE is not set 1078# CONFIG_HUGETLB_PAGE is not set
1047CONFIG_CONFIGFS_FS=m 1079CONFIG_CONFIGFS_FS=m
1048 1080CONFIG_MISC_FILESYSTEMS=y
1049#
1050# Miscellaneous filesystems
1051#
1052# CONFIG_ADFS_FS is not set 1081# CONFIG_ADFS_FS is not set
1053CONFIG_AFFS_FS=m 1082CONFIG_AFFS_FS=m
1054CONFIG_HFS_FS=y 1083CONFIG_HFS_FS=y
@@ -1057,6 +1086,9 @@ CONFIG_HFSPLUS_FS=y
1057# CONFIG_BFS_FS is not set 1086# CONFIG_BFS_FS is not set
1058# CONFIG_EFS_FS is not set 1087# CONFIG_EFS_FS is not set
1059CONFIG_CRAMFS=m 1088CONFIG_CRAMFS=m
1089CONFIG_SQUASHFS=m
1090# CONFIG_SQUASHFS_EMBEDDED is not set
1091CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1060# CONFIG_VXFS_FS is not set 1092# CONFIG_VXFS_FS is not set
1061CONFIG_MINIX_FS=y 1093CONFIG_MINIX_FS=y
1062# CONFIG_OMFS_FS is not set 1094# CONFIG_OMFS_FS is not set
@@ -1067,6 +1099,7 @@ CONFIG_SYSV_FS=m
1067CONFIG_UFS_FS=m 1099CONFIG_UFS_FS=m
1068# CONFIG_UFS_FS_WRITE is not set 1100# CONFIG_UFS_FS_WRITE is not set
1069# CONFIG_UFS_DEBUG is not set 1101# CONFIG_UFS_DEBUG is not set
1102# CONFIG_NILFS2_FS is not set
1070CONFIG_NETWORK_FILESYSTEMS=y 1103CONFIG_NETWORK_FILESYSTEMS=y
1071CONFIG_NFS_FS=y 1104CONFIG_NFS_FS=y
1072CONFIG_NFS_V3=y 1105CONFIG_NFS_V3=y
@@ -1083,7 +1116,6 @@ CONFIG_EXPORTFS=m
1083CONFIG_NFS_COMMON=y 1116CONFIG_NFS_COMMON=y
1084CONFIG_SUNRPC=y 1117CONFIG_SUNRPC=y
1085CONFIG_SUNRPC_GSS=y 1118CONFIG_SUNRPC_GSS=y
1086# CONFIG_SUNRPC_REGISTER_V4 is not set
1087CONFIG_RPCSEC_GSS_KRB5=y 1119CONFIG_RPCSEC_GSS_KRB5=y
1088# CONFIG_RPCSEC_GSS_SPKM3 is not set 1120# CONFIG_RPCSEC_GSS_SPKM3 is not set
1089CONFIG_SMB_FS=m 1121CONFIG_SMB_FS=m
@@ -1163,11 +1195,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1163CONFIG_DEBUG_MEMORY_INIT=y 1195CONFIG_DEBUG_MEMORY_INIT=y
1164# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1196# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1165CONFIG_SYSCTL_SYSCALL_CHECK=y 1197CONFIG_SYSCTL_SYSCALL_CHECK=y
1166
1167#
1168# Tracers
1169#
1170# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1171# CONFIG_SAMPLES is not set 1198# CONFIG_SAMPLES is not set
1172 1199
1173# 1200#
@@ -1188,13 +1215,21 @@ CONFIG_CRYPTO=y
1188# 1215#
1189# CONFIG_CRYPTO_FIPS is not set 1216# CONFIG_CRYPTO_FIPS is not set
1190CONFIG_CRYPTO_ALGAPI=y 1217CONFIG_CRYPTO_ALGAPI=y
1191CONFIG_CRYPTO_AEAD=y 1218CONFIG_CRYPTO_ALGAPI2=y
1219CONFIG_CRYPTO_AEAD=m
1220CONFIG_CRYPTO_AEAD2=y
1192CONFIG_CRYPTO_BLKCIPHER=y 1221CONFIG_CRYPTO_BLKCIPHER=y
1222CONFIG_CRYPTO_BLKCIPHER2=y
1193CONFIG_CRYPTO_HASH=y 1223CONFIG_CRYPTO_HASH=y
1194CONFIG_CRYPTO_RNG=y 1224CONFIG_CRYPTO_HASH2=y
1225CONFIG_CRYPTO_RNG=m
1226CONFIG_CRYPTO_RNG2=y
1227CONFIG_CRYPTO_PCOMP=y
1195CONFIG_CRYPTO_MANAGER=y 1228CONFIG_CRYPTO_MANAGER=y
1229CONFIG_CRYPTO_MANAGER2=y
1196CONFIG_CRYPTO_GF128MUL=m 1230CONFIG_CRYPTO_GF128MUL=m
1197CONFIG_CRYPTO_NULL=m 1231CONFIG_CRYPTO_NULL=m
1232CONFIG_CRYPTO_WORKQUEUE=y
1198CONFIG_CRYPTO_CRYPTD=m 1233CONFIG_CRYPTO_CRYPTD=m
1199CONFIG_CRYPTO_AUTHENC=m 1234CONFIG_CRYPTO_AUTHENC=m
1200CONFIG_CRYPTO_TEST=m 1235CONFIG_CRYPTO_TEST=m
@@ -1264,6 +1299,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1264# Compression 1299# Compression
1265# 1300#
1266CONFIG_CRYPTO_DEFLATE=m 1301CONFIG_CRYPTO_DEFLATE=m
1302CONFIG_CRYPTO_ZLIB=m
1267CONFIG_CRYPTO_LZO=m 1303CONFIG_CRYPTO_LZO=m
1268 1304
1269# 1305#
@@ -1271,11 +1307,13 @@ CONFIG_CRYPTO_LZO=m
1271# 1307#
1272# CONFIG_CRYPTO_ANSI_CPRNG is not set 1308# CONFIG_CRYPTO_ANSI_CPRNG is not set
1273# CONFIG_CRYPTO_HW is not set 1309# CONFIG_CRYPTO_HW is not set
1310# CONFIG_BINARY_PRINTF is not set
1274 1311
1275# 1312#
1276# Library routines 1313# Library routines
1277# 1314#
1278CONFIG_BITREVERSE=y 1315CONFIG_BITREVERSE=y
1316CONFIG_GENERIC_FIND_LAST_BIT=y
1279CONFIG_CRC_CCITT=m 1317CONFIG_CRC_CCITT=m
1280CONFIG_CRC16=y 1318CONFIG_CRC16=y
1281CONFIG_CRC_T10DIF=y 1319CONFIG_CRC_T10DIF=y
@@ -1287,10 +1325,13 @@ CONFIG_ZLIB_INFLATE=y
1287CONFIG_ZLIB_DEFLATE=m 1325CONFIG_ZLIB_DEFLATE=m
1288CONFIG_LZO_COMPRESS=m 1326CONFIG_LZO_COMPRESS=m
1289CONFIG_LZO_DECOMPRESS=m 1327CONFIG_LZO_DECOMPRESS=m
1328CONFIG_DECOMPRESS_GZIP=y
1329CONFIG_DECOMPRESS_BZIP2=y
1330CONFIG_DECOMPRESS_LZMA=y
1290CONFIG_TEXTSEARCH=y 1331CONFIG_TEXTSEARCH=y
1291CONFIG_TEXTSEARCH_KMP=m 1332CONFIG_TEXTSEARCH_KMP=m
1292CONFIG_TEXTSEARCH_BM=m 1333CONFIG_TEXTSEARCH_BM=m
1293CONFIG_TEXTSEARCH_FSM=m 1334CONFIG_TEXTSEARCH_FSM=m
1294CONFIG_PLIST=y
1295CONFIG_HAS_IOMEM=y 1335CONFIG_HAS_IOMEM=y
1296CONFIG_HAS_DMA=y 1336CONFIG_HAS_DMA=y
1337CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 52d42715bd0b..7dceb5d71223 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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:50 2008 4# Wed Apr 22 20:48:08 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 154CONFIG_NEED_MULTIPLE_NODES=y
144CONFIG_PAGEFLAGS_EXTENDED=y 155CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set
147# CONFIG_PHYS_ADDR_T_64BIT is not set 157# CONFIG_PHYS_ADDR_T_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 158CONFIG_ZONE_DMA_FLAG=1
149CONFIG_BOUNCE=y 159CONFIG_BOUNCE=y
150CONFIG_VIRT_TO_BUS=y 160CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y 161CONFIG_UNEVICTABLE_LRU=y
162CONFIG_HAVE_MLOCK=y
163CONFIG_HAVE_MLOCKED_PAGE_BIT=y
152 164
153# 165#
154# General setup 166# General setup
@@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 270CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 271CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 272CONFIG_NETFILTER_XT_TARGET_DSCP=m
273CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 274CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 275CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 276CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 279CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 280CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 281CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
282CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 283CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 284CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 285CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 290CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 291CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 294CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 369CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 370CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 371CONFIG_IP6_NF_MATCH_RT=m
372CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 373CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 374CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 375CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 376CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 377CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 378CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 379CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 380
367# 381#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 382# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 383#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 384# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 385# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 386CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 387# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 388# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 459# CONFIG_C2PORT is not set
460
461#
462# EEPROM support
463#
464# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 465CONFIG_HAVE_IDE=y
450# CONFIG_IDE is not set 466# CONFIG_IDE is not set
451 467
@@ -493,9 +509,12 @@ CONFIG_SCSI_SRP_ATTRS=m
493CONFIG_SCSI_SRP_TGT_ATTRS=y 509CONFIG_SCSI_SRP_TGT_ATTRS=y
494CONFIG_SCSI_LOWLEVEL=y 510CONFIG_SCSI_LOWLEVEL=y
495CONFIG_ISCSI_TCP=m 511CONFIG_ISCSI_TCP=m
512# CONFIG_LIBFC is not set
513# CONFIG_LIBFCOE is not set
496# CONFIG_SCSI_DEBUG is not set 514# CONFIG_SCSI_DEBUG is not set
497CONFIG_MVME147_SCSI=y 515CONFIG_MVME147_SCSI=y
498# CONFIG_SCSI_DH is not set 516# CONFIG_SCSI_DH is not set
517# CONFIG_SCSI_OSD_INITIATOR is not set
499CONFIG_MD=y 518CONFIG_MD=y
500CONFIG_BLK_DEV_MD=m 519CONFIG_BLK_DEV_MD=m
501CONFIG_MD_LINEAR=m 520CONFIG_MD_LINEAR=m
@@ -503,7 +522,7 @@ CONFIG_MD_RAID0=m
503CONFIG_MD_RAID1=m 522CONFIG_MD_RAID1=m
504# CONFIG_MD_RAID10 is not set 523# CONFIG_MD_RAID10 is not set
505CONFIG_MD_RAID456=m 524CONFIG_MD_RAID456=m
506CONFIG_MD_RAID5_RESHAPE=y 525CONFIG_MD_RAID6_PQ=m
507# CONFIG_MD_MULTIPATH is not set 526# CONFIG_MD_MULTIPATH is not set
508# CONFIG_MD_FAULTY is not set 527# CONFIG_MD_FAULTY is not set
509CONFIG_BLK_DEV_DM=m 528CONFIG_BLK_DEV_DM=m
@@ -516,6 +535,7 @@ CONFIG_DM_MULTIPATH=m
516# CONFIG_DM_DELAY is not set 535# CONFIG_DM_DELAY is not set
517CONFIG_DM_UEVENT=y 536CONFIG_DM_UEVENT=y
518CONFIG_NETDEVICES=y 537CONFIG_NETDEVICES=y
538CONFIG_COMPAT_NET_DEV_OPS=y
519CONFIG_DUMMY=m 539CONFIG_DUMMY=m
520# CONFIG_BONDING is not set 540# CONFIG_BONDING is not set
521CONFIG_MACVLAN=m 541CONFIG_MACVLAN=m
@@ -526,6 +546,8 @@ CONFIG_VETH=m
526CONFIG_NET_ETHERNET=y 546CONFIG_NET_ETHERNET=y
527# CONFIG_MII is not set 547# CONFIG_MII is not set
528CONFIG_MVME147_NET=y 548CONFIG_MVME147_NET=y
549# CONFIG_ETHOC is not set
550# CONFIG_DNET is not set
529# CONFIG_IBM_NEW_EMAC_ZMII is not set 551# CONFIG_IBM_NEW_EMAC_ZMII is not set
530# CONFIG_IBM_NEW_EMAC_RGMII is not set 552# CONFIG_IBM_NEW_EMAC_RGMII is not set
531# CONFIG_IBM_NEW_EMAC_TAH is not set 553# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -542,7 +564,10 @@ CONFIG_MVME147_NET=y
542# 564#
543# CONFIG_WLAN_PRE80211 is not set 565# CONFIG_WLAN_PRE80211 is not set
544# CONFIG_WLAN_80211 is not set 566# CONFIG_WLAN_80211 is not set
545# CONFIG_IWLWIFI_LEDS is not set 567
568#
569# Enable WiMAX (Networking options) to see the WiMAX drivers
570#
546# CONFIG_WAN is not set 571# CONFIG_WAN is not set
547CONFIG_PPP=m 572CONFIG_PPP=m
548# CONFIG_PPP_MULTILINK is not set 573# CONFIG_PPP_MULTILINK is not set
@@ -600,7 +625,6 @@ CONFIG_MOUSE_PS2=m
600CONFIG_MOUSE_PS2_ALPS=y 625CONFIG_MOUSE_PS2_ALPS=y
601CONFIG_MOUSE_PS2_LOGIPS2PP=y 626CONFIG_MOUSE_PS2_LOGIPS2PP=y
602CONFIG_MOUSE_PS2_SYNAPTICS=y 627CONFIG_MOUSE_PS2_SYNAPTICS=y
603CONFIG_MOUSE_PS2_LIFEBOOK=y
604CONFIG_MOUSE_PS2_TRACKPOINT=y 628CONFIG_MOUSE_PS2_TRACKPOINT=y
605# CONFIG_MOUSE_PS2_ELANTECH is not set 629# CONFIG_MOUSE_PS2_ELANTECH is not set
606# CONFIG_MOUSE_PS2_TOUCHKIT is not set 630# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -640,6 +664,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
640# Non-8250 serial port support 664# Non-8250 serial port support
641# 665#
642CONFIG_UNIX98_PTYS=y 666CONFIG_UNIX98_PTYS=y
667# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
643CONFIG_LEGACY_PTYS=y 668CONFIG_LEGACY_PTYS=y
644CONFIG_LEGACY_PTY_COUNT=256 669CONFIG_LEGACY_PTY_COUNT=256
645# CONFIG_IPMI_HANDLER is not set 670# CONFIG_IPMI_HANDLER is not set
@@ -716,7 +741,6 @@ CONFIG_HIDRAW=y
716# 741#
717# Special HID drivers 742# Special HID drivers
718# 743#
719CONFIG_HID_COMPAT=y
720# CONFIG_USB_SUPPORT is not set 744# CONFIG_USB_SUPPORT is not set
721# CONFIG_MMC is not set 745# CONFIG_MMC is not set
722# CONFIG_MEMSTICK is not set 746# CONFIG_MEMSTICK is not set
@@ -724,9 +748,9 @@ CONFIG_HID_COMPAT=y
724# CONFIG_ACCESSIBILITY is not set 748# CONFIG_ACCESSIBILITY is not set
725# CONFIG_RTC_CLASS is not set 749# CONFIG_RTC_CLASS is not set
726# CONFIG_DMADEVICES is not set 750# CONFIG_DMADEVICES is not set
751# CONFIG_AUXDISPLAY is not set
727# CONFIG_UIO is not set 752# CONFIG_UIO is not set
728# CONFIG_STAGING is not set 753# CONFIG_STAGING is not set
729CONFIG_STAGING_EXCLUDE_BUILD=y
730 754
731# 755#
732# Character devices 756# Character devices
@@ -741,6 +765,7 @@ CONFIG_EXT2_FS=y
741# CONFIG_EXT2_FS_XATTR is not set 765# CONFIG_EXT2_FS_XATTR is not set
742# CONFIG_EXT2_FS_XIP is not set 766# CONFIG_EXT2_FS_XIP is not set
743CONFIG_EXT3_FS=y 767CONFIG_EXT3_FS=y
768# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
744# CONFIG_EXT3_FS_XATTR is not set 769# CONFIG_EXT3_FS_XATTR is not set
745# CONFIG_EXT4_FS is not set 770# CONFIG_EXT4_FS is not set
746CONFIG_JBD=y 771CONFIG_JBD=y
@@ -767,13 +792,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
767# CONFIG_OCFS2_FS_STATS is not set 792# CONFIG_OCFS2_FS_STATS is not set
768# CONFIG_OCFS2_DEBUG_MASKLOG is not set 793# CONFIG_OCFS2_DEBUG_MASKLOG is not set
769# CONFIG_OCFS2_DEBUG_FS is not set 794# CONFIG_OCFS2_DEBUG_FS is not set
770# CONFIG_OCFS2_COMPAT_JBD is not set 795# CONFIG_OCFS2_FS_POSIX_ACL is not set
796# CONFIG_BTRFS_FS is not set
771CONFIG_DNOTIFY=y 797CONFIG_DNOTIFY=y
772CONFIG_INOTIFY=y 798CONFIG_INOTIFY=y
773CONFIG_INOTIFY_USER=y 799CONFIG_INOTIFY_USER=y
774CONFIG_QUOTA=y 800CONFIG_QUOTA=y
775CONFIG_QUOTA_NETLINK_INTERFACE=y 801CONFIG_QUOTA_NETLINK_INTERFACE=y
776# CONFIG_PRINT_QUOTA_WARNING is not set 802# CONFIG_PRINT_QUOTA_WARNING is not set
803CONFIG_QUOTA_TREE=m
777# CONFIG_QFMT_V1 is not set 804# CONFIG_QFMT_V1 is not set
778# CONFIG_QFMT_V2 is not set 805# CONFIG_QFMT_V2 is not set
779CONFIG_QUOTACTL=y 806CONFIG_QUOTACTL=y
@@ -782,6 +809,11 @@ CONFIG_AUTOFS4_FS=m
782CONFIG_FUSE_FS=m 809CONFIG_FUSE_FS=m
783 810
784# 811#
812# Caches
813#
814# CONFIG_FSCACHE is not set
815
816#
785# CD-ROM/DVD Filesystems 817# CD-ROM/DVD Filesystems
786# 818#
787CONFIG_ISO9660_FS=y 819CONFIG_ISO9660_FS=y
@@ -812,10 +844,7 @@ CONFIG_TMPFS=y
812# CONFIG_TMPFS_POSIX_ACL is not set 844# CONFIG_TMPFS_POSIX_ACL is not set
813# CONFIG_HUGETLB_PAGE is not set 845# CONFIG_HUGETLB_PAGE is not set
814CONFIG_CONFIGFS_FS=m 846CONFIG_CONFIGFS_FS=m
815 847CONFIG_MISC_FILESYSTEMS=y
816#
817# Miscellaneous filesystems
818#
819# CONFIG_ADFS_FS is not set 848# CONFIG_ADFS_FS is not set
820CONFIG_AFFS_FS=m 849CONFIG_AFFS_FS=m
821CONFIG_HFS_FS=m 850CONFIG_HFS_FS=m
@@ -824,6 +853,9 @@ CONFIG_HFSPLUS_FS=m
824# CONFIG_BFS_FS is not set 853# CONFIG_BFS_FS is not set
825# CONFIG_EFS_FS is not set 854# CONFIG_EFS_FS is not set
826CONFIG_CRAMFS=m 855CONFIG_CRAMFS=m
856CONFIG_SQUASHFS=m
857# CONFIG_SQUASHFS_EMBEDDED is not set
858CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
827# CONFIG_VXFS_FS is not set 859# CONFIG_VXFS_FS is not set
828CONFIG_MINIX_FS=y 860CONFIG_MINIX_FS=y
829# CONFIG_OMFS_FS is not set 861# CONFIG_OMFS_FS is not set
@@ -834,6 +866,7 @@ CONFIG_SYSV_FS=m
834CONFIG_UFS_FS=m 866CONFIG_UFS_FS=m
835# CONFIG_UFS_FS_WRITE is not set 867# CONFIG_UFS_FS_WRITE is not set
836# CONFIG_UFS_DEBUG is not set 868# CONFIG_UFS_DEBUG is not set
869# CONFIG_NILFS2_FS is not set
837CONFIG_NETWORK_FILESYSTEMS=y 870CONFIG_NETWORK_FILESYSTEMS=y
838CONFIG_NFS_FS=y 871CONFIG_NFS_FS=y
839CONFIG_NFS_V3=y 872CONFIG_NFS_V3=y
@@ -850,7 +883,6 @@ CONFIG_EXPORTFS=m
850CONFIG_NFS_COMMON=y 883CONFIG_NFS_COMMON=y
851CONFIG_SUNRPC=y 884CONFIG_SUNRPC=y
852CONFIG_SUNRPC_GSS=y 885CONFIG_SUNRPC_GSS=y
853# CONFIG_SUNRPC_REGISTER_V4 is not set
854CONFIG_RPCSEC_GSS_KRB5=y 886CONFIG_RPCSEC_GSS_KRB5=y
855# CONFIG_RPCSEC_GSS_SPKM3 is not set 887# CONFIG_RPCSEC_GSS_SPKM3 is not set
856CONFIG_SMB_FS=m 888CONFIG_SMB_FS=m
@@ -926,11 +958,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
926CONFIG_DEBUG_MEMORY_INIT=y 958CONFIG_DEBUG_MEMORY_INIT=y
927# CONFIG_RCU_CPU_STALL_DETECTOR is not set 959# CONFIG_RCU_CPU_STALL_DETECTOR is not set
928CONFIG_SYSCTL_SYSCALL_CHECK=y 960CONFIG_SYSCTL_SYSCALL_CHECK=y
929
930#
931# Tracers
932#
933# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
934# CONFIG_SAMPLES is not set 961# CONFIG_SAMPLES is not set
935 962
936# 963#
@@ -951,13 +978,21 @@ CONFIG_CRYPTO=y
951# 978#
952# CONFIG_CRYPTO_FIPS is not set 979# CONFIG_CRYPTO_FIPS is not set
953CONFIG_CRYPTO_ALGAPI=y 980CONFIG_CRYPTO_ALGAPI=y
954CONFIG_CRYPTO_AEAD=y 981CONFIG_CRYPTO_ALGAPI2=y
982CONFIG_CRYPTO_AEAD=m
983CONFIG_CRYPTO_AEAD2=y
955CONFIG_CRYPTO_BLKCIPHER=y 984CONFIG_CRYPTO_BLKCIPHER=y
985CONFIG_CRYPTO_BLKCIPHER2=y
956CONFIG_CRYPTO_HASH=y 986CONFIG_CRYPTO_HASH=y
957CONFIG_CRYPTO_RNG=y 987CONFIG_CRYPTO_HASH2=y
988CONFIG_CRYPTO_RNG=m
989CONFIG_CRYPTO_RNG2=y
990CONFIG_CRYPTO_PCOMP=y
958CONFIG_CRYPTO_MANAGER=y 991CONFIG_CRYPTO_MANAGER=y
992CONFIG_CRYPTO_MANAGER2=y
959CONFIG_CRYPTO_GF128MUL=m 993CONFIG_CRYPTO_GF128MUL=m
960CONFIG_CRYPTO_NULL=m 994CONFIG_CRYPTO_NULL=m
995CONFIG_CRYPTO_WORKQUEUE=y
961CONFIG_CRYPTO_CRYPTD=m 996CONFIG_CRYPTO_CRYPTD=m
962CONFIG_CRYPTO_AUTHENC=m 997CONFIG_CRYPTO_AUTHENC=m
963CONFIG_CRYPTO_TEST=m 998CONFIG_CRYPTO_TEST=m
@@ -1027,6 +1062,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1027# Compression 1062# Compression
1028# 1063#
1029CONFIG_CRYPTO_DEFLATE=m 1064CONFIG_CRYPTO_DEFLATE=m
1065CONFIG_CRYPTO_ZLIB=m
1030CONFIG_CRYPTO_LZO=m 1066CONFIG_CRYPTO_LZO=m
1031 1067
1032# 1068#
@@ -1034,11 +1070,13 @@ CONFIG_CRYPTO_LZO=m
1034# 1070#
1035# CONFIG_CRYPTO_ANSI_CPRNG is not set 1071# CONFIG_CRYPTO_ANSI_CPRNG is not set
1036# CONFIG_CRYPTO_HW is not set 1072# CONFIG_CRYPTO_HW is not set
1073# CONFIG_BINARY_PRINTF is not set
1037 1074
1038# 1075#
1039# Library routines 1076# Library routines
1040# 1077#
1041CONFIG_BITREVERSE=y 1078CONFIG_BITREVERSE=y
1079CONFIG_GENERIC_FIND_LAST_BIT=y
1042CONFIG_CRC_CCITT=m 1080CONFIG_CRC_CCITT=m
1043CONFIG_CRC16=m 1081CONFIG_CRC16=m
1044CONFIG_CRC_T10DIF=y 1082CONFIG_CRC_T10DIF=y
@@ -1050,10 +1088,13 @@ CONFIG_ZLIB_INFLATE=y
1050CONFIG_ZLIB_DEFLATE=m 1088CONFIG_ZLIB_DEFLATE=m
1051CONFIG_LZO_COMPRESS=m 1089CONFIG_LZO_COMPRESS=m
1052CONFIG_LZO_DECOMPRESS=m 1090CONFIG_LZO_DECOMPRESS=m
1091CONFIG_DECOMPRESS_GZIP=y
1092CONFIG_DECOMPRESS_BZIP2=y
1093CONFIG_DECOMPRESS_LZMA=y
1053CONFIG_TEXTSEARCH=y 1094CONFIG_TEXTSEARCH=y
1054CONFIG_TEXTSEARCH_KMP=m 1095CONFIG_TEXTSEARCH_KMP=m
1055CONFIG_TEXTSEARCH_BM=m 1096CONFIG_TEXTSEARCH_BM=m
1056CONFIG_TEXTSEARCH_FSM=m 1097CONFIG_TEXTSEARCH_FSM=m
1057CONFIG_PLIST=y
1058CONFIG_HAS_IOMEM=y 1098CONFIG_HAS_IOMEM=y
1059CONFIG_HAS_DMA=y 1099CONFIG_HAS_DMA=y
1100CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 3403ed2eda79..890594fcacb3 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:51 2008 4# Wed Apr 22 20:48:10 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 154CONFIG_NEED_MULTIPLE_NODES=y
144CONFIG_PAGEFLAGS_EXTENDED=y 155CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set
147# CONFIG_PHYS_ADDR_T_64BIT is not set 157# CONFIG_PHYS_ADDR_T_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 158CONFIG_ZONE_DMA_FLAG=1
149CONFIG_BOUNCE=y 159CONFIG_BOUNCE=y
150CONFIG_VIRT_TO_BUS=y 160CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y 161CONFIG_UNEVICTABLE_LRU=y
162CONFIG_HAVE_MLOCK=y
163CONFIG_HAVE_MLOCKED_PAGE_BIT=y
152 164
153# 165#
154# General setup 166# General setup
@@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 270CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 271CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 272CONFIG_NETFILTER_XT_TARGET_DSCP=m
273CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 274CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 275CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 276CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 279CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 280CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 281CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
282CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 283CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 284CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 285CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 290CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 291CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 294CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 369CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 370CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 371CONFIG_IP6_NF_MATCH_RT=m
372CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 373CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 374CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 375CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 376CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 377CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 378CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 379CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 380
367# 381#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 382# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 383#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 384# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 385# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 386CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 387# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 388# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 459# CONFIG_C2PORT is not set
460
461#
462# EEPROM support
463#
464# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 465CONFIG_HAVE_IDE=y
450# CONFIG_IDE is not set 466# CONFIG_IDE is not set
451 467
@@ -493,10 +509,13 @@ CONFIG_SCSI_SRP_ATTRS=m
493CONFIG_SCSI_SRP_TGT_ATTRS=y 509CONFIG_SCSI_SRP_TGT_ATTRS=y
494CONFIG_SCSI_LOWLEVEL=y 510CONFIG_SCSI_LOWLEVEL=y
495CONFIG_ISCSI_TCP=m 511CONFIG_ISCSI_TCP=m
512# CONFIG_LIBFC is not set
513# CONFIG_LIBFCOE is not set
496CONFIG_53C700_BE_BUS=y 514CONFIG_53C700_BE_BUS=y
497# CONFIG_SCSI_DEBUG is not set 515# CONFIG_SCSI_DEBUG is not set
498CONFIG_MVME16x_SCSI=y 516CONFIG_MVME16x_SCSI=y
499# CONFIG_SCSI_DH is not set 517# CONFIG_SCSI_DH is not set
518# CONFIG_SCSI_OSD_INITIATOR is not set
500CONFIG_MD=y 519CONFIG_MD=y
501CONFIG_BLK_DEV_MD=m 520CONFIG_BLK_DEV_MD=m
502CONFIG_MD_LINEAR=m 521CONFIG_MD_LINEAR=m
@@ -504,7 +523,7 @@ CONFIG_MD_RAID0=m
504CONFIG_MD_RAID1=m 523CONFIG_MD_RAID1=m
505# CONFIG_MD_RAID10 is not set 524# CONFIG_MD_RAID10 is not set
506CONFIG_MD_RAID456=m 525CONFIG_MD_RAID456=m
507CONFIG_MD_RAID5_RESHAPE=y 526CONFIG_MD_RAID6_PQ=m
508# CONFIG_MD_MULTIPATH is not set 527# CONFIG_MD_MULTIPATH is not set
509# CONFIG_MD_FAULTY is not set 528# CONFIG_MD_FAULTY is not set
510CONFIG_BLK_DEV_DM=m 529CONFIG_BLK_DEV_DM=m
@@ -517,6 +536,7 @@ CONFIG_DM_MULTIPATH=m
517# CONFIG_DM_DELAY is not set 536# CONFIG_DM_DELAY is not set
518CONFIG_DM_UEVENT=y 537CONFIG_DM_UEVENT=y
519CONFIG_NETDEVICES=y 538CONFIG_NETDEVICES=y
539CONFIG_COMPAT_NET_DEV_OPS=y
520CONFIG_DUMMY=m 540CONFIG_DUMMY=m
521# CONFIG_BONDING is not set 541# CONFIG_BONDING is not set
522CONFIG_MACVLAN=m 542CONFIG_MACVLAN=m
@@ -527,6 +547,8 @@ CONFIG_VETH=m
527CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
528# CONFIG_MII is not set 548# CONFIG_MII is not set
529CONFIG_MVME16x_NET=y 549CONFIG_MVME16x_NET=y
550# CONFIG_ETHOC is not set
551# CONFIG_DNET is not set
530# CONFIG_IBM_NEW_EMAC_ZMII is not set 552# CONFIG_IBM_NEW_EMAC_ZMII is not set
531# CONFIG_IBM_NEW_EMAC_RGMII is not set 553# CONFIG_IBM_NEW_EMAC_RGMII is not set
532# CONFIG_IBM_NEW_EMAC_TAH is not set 554# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -543,7 +565,10 @@ CONFIG_MVME16x_NET=y
543# 565#
544# CONFIG_WLAN_PRE80211 is not set 566# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set 567# CONFIG_WLAN_80211 is not set
546# CONFIG_IWLWIFI_LEDS is not set 568
569#
570# Enable WiMAX (Networking options) to see the WiMAX drivers
571#
547# CONFIG_WAN is not set 572# CONFIG_WAN is not set
548CONFIG_PPP=m 573CONFIG_PPP=m
549# CONFIG_PPP_MULTILINK is not set 574# CONFIG_PPP_MULTILINK is not set
@@ -601,7 +626,6 @@ CONFIG_MOUSE_PS2=m
601CONFIG_MOUSE_PS2_ALPS=y 626CONFIG_MOUSE_PS2_ALPS=y
602CONFIG_MOUSE_PS2_LOGIPS2PP=y 627CONFIG_MOUSE_PS2_LOGIPS2PP=y
603CONFIG_MOUSE_PS2_SYNAPTICS=y 628CONFIG_MOUSE_PS2_SYNAPTICS=y
604CONFIG_MOUSE_PS2_LIFEBOOK=y
605CONFIG_MOUSE_PS2_TRACKPOINT=y 629CONFIG_MOUSE_PS2_TRACKPOINT=y
606# CONFIG_MOUSE_PS2_ELANTECH is not set 630# CONFIG_MOUSE_PS2_ELANTECH is not set
607# CONFIG_MOUSE_PS2_TOUCHKIT is not set 631# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -641,6 +665,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
641# Non-8250 serial port support 665# Non-8250 serial port support
642# 666#
643CONFIG_UNIX98_PTYS=y 667CONFIG_UNIX98_PTYS=y
668# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
644CONFIG_LEGACY_PTYS=y 669CONFIG_LEGACY_PTYS=y
645CONFIG_LEGACY_PTY_COUNT=256 670CONFIG_LEGACY_PTY_COUNT=256
646# CONFIG_IPMI_HANDLER is not set 671# CONFIG_IPMI_HANDLER is not set
@@ -717,7 +742,6 @@ CONFIG_HIDRAW=y
717# 742#
718# Special HID drivers 743# Special HID drivers
719# 744#
720CONFIG_HID_COMPAT=y
721# CONFIG_USB_SUPPORT is not set 745# CONFIG_USB_SUPPORT is not set
722# CONFIG_MMC is not set 746# CONFIG_MMC is not set
723# CONFIG_MEMSTICK is not set 747# CONFIG_MEMSTICK is not set
@@ -725,9 +749,9 @@ CONFIG_HID_COMPAT=y
725# CONFIG_ACCESSIBILITY is not set 749# CONFIG_ACCESSIBILITY is not set
726# CONFIG_RTC_CLASS is not set 750# CONFIG_RTC_CLASS is not set
727# CONFIG_DMADEVICES is not set 751# CONFIG_DMADEVICES is not set
752# CONFIG_AUXDISPLAY is not set
728# CONFIG_UIO is not set 753# CONFIG_UIO is not set
729# CONFIG_STAGING is not set 754# CONFIG_STAGING is not set
730CONFIG_STAGING_EXCLUDE_BUILD=y
731 755
732# 756#
733# Character devices 757# Character devices
@@ -743,6 +767,7 @@ CONFIG_EXT2_FS=y
743# CONFIG_EXT2_FS_XATTR is not set 767# CONFIG_EXT2_FS_XATTR is not set
744# CONFIG_EXT2_FS_XIP is not set 768# CONFIG_EXT2_FS_XIP is not set
745CONFIG_EXT3_FS=y 769CONFIG_EXT3_FS=y
770# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
746# CONFIG_EXT3_FS_XATTR is not set 771# CONFIG_EXT3_FS_XATTR is not set
747# CONFIG_EXT4_FS is not set 772# CONFIG_EXT4_FS is not set
748CONFIG_JBD=y 773CONFIG_JBD=y
@@ -769,13 +794,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
769# CONFIG_OCFS2_FS_STATS is not set 794# CONFIG_OCFS2_FS_STATS is not set
770# CONFIG_OCFS2_DEBUG_MASKLOG is not set 795# CONFIG_OCFS2_DEBUG_MASKLOG is not set
771# CONFIG_OCFS2_DEBUG_FS is not set 796# CONFIG_OCFS2_DEBUG_FS is not set
772# CONFIG_OCFS2_COMPAT_JBD is not set 797# CONFIG_OCFS2_FS_POSIX_ACL is not set
798# CONFIG_BTRFS_FS is not set
773CONFIG_DNOTIFY=y 799CONFIG_DNOTIFY=y
774CONFIG_INOTIFY=y 800CONFIG_INOTIFY=y
775CONFIG_INOTIFY_USER=y 801CONFIG_INOTIFY_USER=y
776CONFIG_QUOTA=y 802CONFIG_QUOTA=y
777CONFIG_QUOTA_NETLINK_INTERFACE=y 803CONFIG_QUOTA_NETLINK_INTERFACE=y
778# CONFIG_PRINT_QUOTA_WARNING is not set 804# CONFIG_PRINT_QUOTA_WARNING is not set
805CONFIG_QUOTA_TREE=m
779# CONFIG_QFMT_V1 is not set 806# CONFIG_QFMT_V1 is not set
780# CONFIG_QFMT_V2 is not set 807# CONFIG_QFMT_V2 is not set
781CONFIG_QUOTACTL=y 808CONFIG_QUOTACTL=y
@@ -784,6 +811,11 @@ CONFIG_AUTOFS4_FS=m
784CONFIG_FUSE_FS=m 811CONFIG_FUSE_FS=m
785 812
786# 813#
814# Caches
815#
816# CONFIG_FSCACHE is not set
817
818#
787# CD-ROM/DVD Filesystems 819# CD-ROM/DVD Filesystems
788# 820#
789CONFIG_ISO9660_FS=y 821CONFIG_ISO9660_FS=y
@@ -814,10 +846,7 @@ CONFIG_TMPFS=y
814# CONFIG_TMPFS_POSIX_ACL is not set 846# CONFIG_TMPFS_POSIX_ACL is not set
815# CONFIG_HUGETLB_PAGE is not set 847# CONFIG_HUGETLB_PAGE is not set
816CONFIG_CONFIGFS_FS=m 848CONFIG_CONFIGFS_FS=m
817 849CONFIG_MISC_FILESYSTEMS=y
818#
819# Miscellaneous filesystems
820#
821# CONFIG_ADFS_FS is not set 850# CONFIG_ADFS_FS is not set
822CONFIG_AFFS_FS=m 851CONFIG_AFFS_FS=m
823CONFIG_HFS_FS=m 852CONFIG_HFS_FS=m
@@ -826,6 +855,9 @@ CONFIG_HFSPLUS_FS=m
826# CONFIG_BFS_FS is not set 855# CONFIG_BFS_FS is not set
827# CONFIG_EFS_FS is not set 856# CONFIG_EFS_FS is not set
828CONFIG_CRAMFS=m 857CONFIG_CRAMFS=m
858CONFIG_SQUASHFS=m
859# CONFIG_SQUASHFS_EMBEDDED is not set
860CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
829# CONFIG_VXFS_FS is not set 861# CONFIG_VXFS_FS is not set
830CONFIG_MINIX_FS=y 862CONFIG_MINIX_FS=y
831# CONFIG_OMFS_FS is not set 863# CONFIG_OMFS_FS is not set
@@ -836,6 +868,7 @@ CONFIG_SYSV_FS=m
836CONFIG_UFS_FS=m 868CONFIG_UFS_FS=m
837# CONFIG_UFS_FS_WRITE is not set 869# CONFIG_UFS_FS_WRITE is not set
838# CONFIG_UFS_DEBUG is not set 870# CONFIG_UFS_DEBUG is not set
871# CONFIG_NILFS2_FS is not set
839CONFIG_NETWORK_FILESYSTEMS=y 872CONFIG_NETWORK_FILESYSTEMS=y
840CONFIG_NFS_FS=y 873CONFIG_NFS_FS=y
841CONFIG_NFS_V3=y 874CONFIG_NFS_V3=y
@@ -852,7 +885,6 @@ CONFIG_EXPORTFS=m
852CONFIG_NFS_COMMON=y 885CONFIG_NFS_COMMON=y
853CONFIG_SUNRPC=y 886CONFIG_SUNRPC=y
854CONFIG_SUNRPC_GSS=y 887CONFIG_SUNRPC_GSS=y
855# CONFIG_SUNRPC_REGISTER_V4 is not set
856CONFIG_RPCSEC_GSS_KRB5=y 888CONFIG_RPCSEC_GSS_KRB5=y
857# CONFIG_RPCSEC_GSS_SPKM3 is not set 889# CONFIG_RPCSEC_GSS_SPKM3 is not set
858CONFIG_SMB_FS=m 890CONFIG_SMB_FS=m
@@ -928,11 +960,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
928CONFIG_DEBUG_MEMORY_INIT=y 960CONFIG_DEBUG_MEMORY_INIT=y
929# CONFIG_RCU_CPU_STALL_DETECTOR is not set 961# CONFIG_RCU_CPU_STALL_DETECTOR is not set
930CONFIG_SYSCTL_SYSCALL_CHECK=y 962CONFIG_SYSCTL_SYSCALL_CHECK=y
931
932#
933# Tracers
934#
935# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
936# CONFIG_SAMPLES is not set 963# CONFIG_SAMPLES is not set
937 964
938# 965#
@@ -953,13 +980,21 @@ CONFIG_CRYPTO=y
953# 980#
954# CONFIG_CRYPTO_FIPS is not set 981# CONFIG_CRYPTO_FIPS is not set
955CONFIG_CRYPTO_ALGAPI=y 982CONFIG_CRYPTO_ALGAPI=y
956CONFIG_CRYPTO_AEAD=y 983CONFIG_CRYPTO_ALGAPI2=y
984CONFIG_CRYPTO_AEAD=m
985CONFIG_CRYPTO_AEAD2=y
957CONFIG_CRYPTO_BLKCIPHER=y 986CONFIG_CRYPTO_BLKCIPHER=y
987CONFIG_CRYPTO_BLKCIPHER2=y
958CONFIG_CRYPTO_HASH=y 988CONFIG_CRYPTO_HASH=y
959CONFIG_CRYPTO_RNG=y 989CONFIG_CRYPTO_HASH2=y
990CONFIG_CRYPTO_RNG=m
991CONFIG_CRYPTO_RNG2=y
992CONFIG_CRYPTO_PCOMP=y
960CONFIG_CRYPTO_MANAGER=y 993CONFIG_CRYPTO_MANAGER=y
994CONFIG_CRYPTO_MANAGER2=y
961CONFIG_CRYPTO_GF128MUL=m 995CONFIG_CRYPTO_GF128MUL=m
962CONFIG_CRYPTO_NULL=m 996CONFIG_CRYPTO_NULL=m
997CONFIG_CRYPTO_WORKQUEUE=y
963CONFIG_CRYPTO_CRYPTD=m 998CONFIG_CRYPTO_CRYPTD=m
964CONFIG_CRYPTO_AUTHENC=m 999CONFIG_CRYPTO_AUTHENC=m
965CONFIG_CRYPTO_TEST=m 1000CONFIG_CRYPTO_TEST=m
@@ -1029,6 +1064,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1029# Compression 1064# Compression
1030# 1065#
1031CONFIG_CRYPTO_DEFLATE=m 1066CONFIG_CRYPTO_DEFLATE=m
1067CONFIG_CRYPTO_ZLIB=m
1032CONFIG_CRYPTO_LZO=m 1068CONFIG_CRYPTO_LZO=m
1033 1069
1034# 1070#
@@ -1036,11 +1072,13 @@ CONFIG_CRYPTO_LZO=m
1036# 1072#
1037# CONFIG_CRYPTO_ANSI_CPRNG is not set 1073# CONFIG_CRYPTO_ANSI_CPRNG is not set
1038# CONFIG_CRYPTO_HW is not set 1074# CONFIG_CRYPTO_HW is not set
1075# CONFIG_BINARY_PRINTF is not set
1039 1076
1040# 1077#
1041# Library routines 1078# Library routines
1042# 1079#
1043CONFIG_BITREVERSE=y 1080CONFIG_BITREVERSE=y
1081CONFIG_GENERIC_FIND_LAST_BIT=y
1044CONFIG_CRC_CCITT=m 1082CONFIG_CRC_CCITT=m
1045CONFIG_CRC16=m 1083CONFIG_CRC16=m
1046CONFIG_CRC_T10DIF=y 1084CONFIG_CRC_T10DIF=y
@@ -1052,10 +1090,13 @@ CONFIG_ZLIB_INFLATE=y
1052CONFIG_ZLIB_DEFLATE=m 1090CONFIG_ZLIB_DEFLATE=m
1053CONFIG_LZO_COMPRESS=m 1091CONFIG_LZO_COMPRESS=m
1054CONFIG_LZO_DECOMPRESS=m 1092CONFIG_LZO_DECOMPRESS=m
1093CONFIG_DECOMPRESS_GZIP=y
1094CONFIG_DECOMPRESS_BZIP2=y
1095CONFIG_DECOMPRESS_LZMA=y
1055CONFIG_TEXTSEARCH=y 1096CONFIG_TEXTSEARCH=y
1056CONFIG_TEXTSEARCH_KMP=m 1097CONFIG_TEXTSEARCH_KMP=m
1057CONFIG_TEXTSEARCH_BM=m 1098CONFIG_TEXTSEARCH_BM=m
1058CONFIG_TEXTSEARCH_FSM=m 1099CONFIG_TEXTSEARCH_FSM=m
1059CONFIG_PLIST=y
1060CONFIG_HAS_IOMEM=y 1100CONFIG_HAS_IOMEM=y
1061CONFIG_HAS_DMA=y 1101CONFIG_HAS_DMA=y
1102CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 3459c594194b..7cf58c27ff84 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:52 2008 4# Wed Apr 22 20:48:13 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m
255CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 267CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
256CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 268CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
257CONFIG_NETFILTER_XT_TARGET_DSCP=m 269CONFIG_NETFILTER_XT_TARGET_DSCP=m
270CONFIG_NETFILTER_XT_TARGET_HL=m
258CONFIG_NETFILTER_XT_TARGET_MARK=m 271CONFIG_NETFILTER_XT_TARGET_MARK=m
259CONFIG_NETFILTER_XT_TARGET_NFLOG=m 272CONFIG_NETFILTER_XT_TARGET_NFLOG=m
260CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
263CONFIG_NETFILTER_XT_TARGET_TRACE=m 276CONFIG_NETFILTER_XT_TARGET_TRACE=m
264CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
265CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
279CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
266CONFIG_NETFILTER_XT_MATCH_COMMENT=m 280CONFIG_NETFILTER_XT_MATCH_COMMENT=m
267CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 281CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
268CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 282CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
273CONFIG_NETFILTER_XT_MATCH_ESP=m 287CONFIG_NETFILTER_XT_MATCH_ESP=m
274CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
275CONFIG_NETFILTER_XT_MATCH_HELPER=m 289CONFIG_NETFILTER_XT_MATCH_HELPER=m
290CONFIG_NETFILTER_XT_MATCH_HL=m
276CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 291CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
277CONFIG_NETFILTER_XT_MATCH_LENGTH=m 292CONFIG_NETFILTER_XT_MATCH_LENGTH=m
278CONFIG_NETFILTER_XT_MATCH_LIMIT=m 293CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m
351CONFIG_IP6_NF_MATCH_IPV6HEADER=m 366CONFIG_IP6_NF_MATCH_IPV6HEADER=m
352CONFIG_IP6_NF_MATCH_MH=m 367CONFIG_IP6_NF_MATCH_MH=m
353CONFIG_IP6_NF_MATCH_RT=m 368CONFIG_IP6_NF_MATCH_RT=m
369CONFIG_IP6_NF_TARGET_HL=m
354CONFIG_IP6_NF_TARGET_LOG=m 370CONFIG_IP6_NF_TARGET_LOG=m
355CONFIG_IP6_NF_FILTER=m 371CONFIG_IP6_NF_FILTER=m
356CONFIG_IP6_NF_TARGET_REJECT=m 372CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 373CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 374CONFIG_IP6_NF_RAW=m
360CONFIG_IP_DCCP=m 375CONFIG_IP_DCCP=m
361CONFIG_INET_DCCP_DIAG=m 376CONFIG_INET_DCCP_DIAG=m
362CONFIG_IP_DCCP_ACKVEC=y
363 377
364# 378#
365# DCCP CCIDs Configuration (EXPERIMENTAL) 379# DCCP CCIDs Configuration (EXPERIMENTAL)
366# 380#
367CONFIG_IP_DCCP_CCID2=m
368# CONFIG_IP_DCCP_CCID2_DEBUG is not set 381# CONFIG_IP_DCCP_CCID2_DEBUG is not set
369CONFIG_IP_DCCP_CCID3=m 382# CONFIG_IP_DCCP_CCID3 is not set
370# CONFIG_IP_DCCP_CCID3_DEBUG is not set
371CONFIG_IP_DCCP_CCID3_RTO=100
372CONFIG_IP_DCCP_TFRC_LIB=m
373CONFIG_IP_SCTP=m 383CONFIG_IP_SCTP=m
374# CONFIG_SCTP_DBG_MSG is not set 384# CONFIG_SCTP_DBG_MSG is not set
375# CONFIG_SCTP_DBG_OBJCNT is not set 385# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -391,8 +401,10 @@ CONFIG_ATALK=m
391# CONFIG_LAPB is not set 401# CONFIG_LAPB is not set
392# CONFIG_ECONET is not set 402# CONFIG_ECONET is not set
393# CONFIG_WAN_ROUTER is not set 403# CONFIG_WAN_ROUTER is not set
404# CONFIG_PHONET is not set
394# CONFIG_NET_SCHED is not set 405# CONFIG_NET_SCHED is not set
395CONFIG_NET_CLS_ROUTE=y 406CONFIG_NET_CLS_ROUTE=y
407# CONFIG_DCB is not set
396 408
397# 409#
398# Network testing 410# Network testing
@@ -403,8 +415,8 @@ CONFIG_NET_CLS_ROUTE=y
403# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
404# CONFIG_BT is not set 416# CONFIG_BT is not set
405# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
406# CONFIG_PHONET is not set
407# CONFIG_WIRELESS is not set 418# CONFIG_WIRELESS is not set
419# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
410 422
@@ -441,15 +453,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
441CONFIG_ATA_OVER_ETH=m 453CONFIG_ATA_OVER_ETH=m
442# CONFIG_BLK_DEV_HD is not set 454# CONFIG_BLK_DEV_HD is not set
443CONFIG_MISC_DEVICES=y 455CONFIG_MISC_DEVICES=y
444# CONFIG_EEPROM_93CX6 is not set
445# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
446# CONFIG_C2PORT is not set 457# CONFIG_C2PORT is not set
458
459#
460# EEPROM support
461#
462# CONFIG_EEPROM_93CX6 is not set
447CONFIG_HAVE_IDE=y 463CONFIG_HAVE_IDE=y
448CONFIG_IDE=y 464CONFIG_IDE=y
449 465
450# 466#
451# Please see Documentation/ide/ide.txt for help/info on IDE drives 467# Please see Documentation/ide/ide.txt for help/info on IDE drives
452# 468#
469CONFIG_IDE_ATAPI=y
453# CONFIG_BLK_DEV_IDE_SATA is not set 470# CONFIG_BLK_DEV_IDE_SATA is not set
454CONFIG_IDE_GD=y 471CONFIG_IDE_GD=y
455CONFIG_IDE_GD_ATA=y 472CONFIG_IDE_GD_ATA=y
@@ -457,7 +474,6 @@ CONFIG_IDE_GD_ATA=y
457CONFIG_BLK_DEV_IDECD=y 474CONFIG_BLK_DEV_IDECD=y
458CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 475CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
459# CONFIG_BLK_DEV_IDETAPE is not set 476# CONFIG_BLK_DEV_IDETAPE is not set
460# CONFIG_BLK_DEV_IDESCSI is not set
461# CONFIG_IDE_TASK_IOCTL is not set 477# CONFIG_IDE_TASK_IOCTL is not set
462CONFIG_IDE_PROC_FS=y 478CONFIG_IDE_PROC_FS=y
463 479
@@ -516,6 +532,8 @@ CONFIG_ISCSI_TCP=m
516# CONFIG_SCSI_AIC7XXX_OLD is not set 532# CONFIG_SCSI_AIC7XXX_OLD is not set
517# CONFIG_SCSI_ADVANSYS is not set 533# CONFIG_SCSI_ADVANSYS is not set
518# CONFIG_SCSI_IN2000 is not set 534# CONFIG_SCSI_IN2000 is not set
535# CONFIG_LIBFC is not set
536# CONFIG_LIBFCOE is not set
519# CONFIG_SCSI_DTC3280 is not set 537# CONFIG_SCSI_DTC3280 is not set
520# CONFIG_SCSI_FUTURE_DOMAIN is not set 538# CONFIG_SCSI_FUTURE_DOMAIN is not set
521# CONFIG_SCSI_GENERIC_NCR5380 is not set 539# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -527,6 +545,7 @@ CONFIG_ISCSI_TCP=m
527# CONFIG_SCSI_T128 is not set 545# CONFIG_SCSI_T128 is not set
528# CONFIG_SCSI_DEBUG is not set 546# CONFIG_SCSI_DEBUG is not set
529# CONFIG_SCSI_DH is not set 547# CONFIG_SCSI_DH is not set
548# CONFIG_SCSI_OSD_INITIATOR is not set
530CONFIG_MD=y 549CONFIG_MD=y
531CONFIG_BLK_DEV_MD=m 550CONFIG_BLK_DEV_MD=m
532CONFIG_MD_LINEAR=m 551CONFIG_MD_LINEAR=m
@@ -534,7 +553,7 @@ CONFIG_MD_RAID0=m
534CONFIG_MD_RAID1=m 553CONFIG_MD_RAID1=m
535# CONFIG_MD_RAID10 is not set 554# CONFIG_MD_RAID10 is not set
536CONFIG_MD_RAID456=m 555CONFIG_MD_RAID456=m
537CONFIG_MD_RAID5_RESHAPE=y 556CONFIG_MD_RAID6_PQ=m
538# CONFIG_MD_MULTIPATH is not set 557# CONFIG_MD_MULTIPATH is not set
539# CONFIG_MD_FAULTY is not set 558# CONFIG_MD_FAULTY is not set
540CONFIG_BLK_DEV_DM=m 559CONFIG_BLK_DEV_DM=m
@@ -547,6 +566,7 @@ CONFIG_DM_MULTIPATH=m
547# CONFIG_DM_DELAY is not set 566# CONFIG_DM_DELAY is not set
548CONFIG_DM_UEVENT=y 567CONFIG_DM_UEVENT=y
549CONFIG_NETDEVICES=y 568CONFIG_NETDEVICES=y
569CONFIG_COMPAT_NET_DEV_OPS=y
550CONFIG_DUMMY=m 570CONFIG_DUMMY=m
551# CONFIG_BONDING is not set 571# CONFIG_BONDING is not set
552CONFIG_MACVLAN=m 572CONFIG_MACVLAN=m
@@ -559,7 +579,9 @@ CONFIG_NET_ETHERNET=y
559# CONFIG_MII is not set 579# CONFIG_MII is not set
560# CONFIG_NET_VENDOR_3COM is not set 580# CONFIG_NET_VENDOR_3COM is not set
561# CONFIG_NET_VENDOR_SMC is not set 581# CONFIG_NET_VENDOR_SMC is not set
582# CONFIG_ETHOC is not set
562# CONFIG_NET_VENDOR_RACAL is not set 583# CONFIG_NET_VENDOR_RACAL is not set
584# CONFIG_DNET is not set
563# CONFIG_AT1700 is not set 585# CONFIG_AT1700 is not set
564# CONFIG_DEPCA is not set 586# CONFIG_DEPCA is not set
565# CONFIG_HP100 is not set 587# CONFIG_HP100 is not set
@@ -584,7 +606,10 @@ CONFIG_NE2000=m
584# 606#
585# CONFIG_WLAN_PRE80211 is not set 607# CONFIG_WLAN_PRE80211 is not set
586# CONFIG_WLAN_80211 is not set 608# CONFIG_WLAN_80211 is not set
587# CONFIG_IWLWIFI_LEDS is not set 609
610#
611# Enable WiMAX (Networking options) to see the WiMAX drivers
612#
588# CONFIG_WAN is not set 613# CONFIG_WAN is not set
589CONFIG_PPP=m 614CONFIG_PPP=m
590# CONFIG_PPP_MULTILINK is not set 615# CONFIG_PPP_MULTILINK is not set
@@ -642,7 +667,6 @@ CONFIG_MOUSE_PS2=m
642CONFIG_MOUSE_PS2_ALPS=y 667CONFIG_MOUSE_PS2_ALPS=y
643CONFIG_MOUSE_PS2_LOGIPS2PP=y 668CONFIG_MOUSE_PS2_LOGIPS2PP=y
644CONFIG_MOUSE_PS2_SYNAPTICS=y 669CONFIG_MOUSE_PS2_SYNAPTICS=y
645CONFIG_MOUSE_PS2_LIFEBOOK=y
646CONFIG_MOUSE_PS2_TRACKPOINT=y 670CONFIG_MOUSE_PS2_TRACKPOINT=y
647# CONFIG_MOUSE_PS2_ELANTECH is not set 671# CONFIG_MOUSE_PS2_ELANTECH is not set
648# CONFIG_MOUSE_PS2_TOUCHKIT is not set 672# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -688,6 +712,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
688# Non-8250 serial port support 712# Non-8250 serial port support
689# 713#
690CONFIG_UNIX98_PTYS=y 714CONFIG_UNIX98_PTYS=y
715# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
691CONFIG_LEGACY_PTYS=y 716CONFIG_LEGACY_PTYS=y
692CONFIG_LEGACY_PTY_COUNT=256 717CONFIG_LEGACY_PTY_COUNT=256
693# CONFIG_IPMI_HANDLER is not set 718# CONFIG_IPMI_HANDLER is not set
@@ -771,6 +796,7 @@ CONFIG_FB_Q40=y
771# CONFIG_FB_VIRTUAL is not set 796# CONFIG_FB_VIRTUAL is not set
772# CONFIG_FB_METRONOME is not set 797# CONFIG_FB_METRONOME is not set
773# CONFIG_FB_MB862XX is not set 798# CONFIG_FB_MB862XX is not set
799# CONFIG_FB_BROADSHEET is not set
774# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 800# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
775 801
776# 802#
@@ -805,7 +831,6 @@ CONFIG_HIDRAW=y
805# 831#
806# Special HID drivers 832# Special HID drivers
807# 833#
808CONFIG_HID_COMPAT=y
809# CONFIG_USB_SUPPORT is not set 834# CONFIG_USB_SUPPORT is not set
810# CONFIG_MMC is not set 835# CONFIG_MMC is not set
811# CONFIG_MEMSTICK is not set 836# CONFIG_MEMSTICK is not set
@@ -813,9 +838,9 @@ CONFIG_HID_COMPAT=y
813# CONFIG_ACCESSIBILITY is not set 838# CONFIG_ACCESSIBILITY is not set
814# CONFIG_RTC_CLASS is not set 839# CONFIG_RTC_CLASS is not set
815# CONFIG_DMADEVICES is not set 840# CONFIG_DMADEVICES is not set
841# CONFIG_AUXDISPLAY is not set
816# CONFIG_UIO is not set 842# CONFIG_UIO is not set
817# CONFIG_STAGING is not set 843# CONFIG_STAGING is not set
818CONFIG_STAGING_EXCLUDE_BUILD=y
819 844
820# 845#
821# Character devices 846# Character devices
@@ -828,6 +853,7 @@ CONFIG_EXT2_FS=y
828# CONFIG_EXT2_FS_XATTR is not set 853# CONFIG_EXT2_FS_XATTR is not set
829# CONFIG_EXT2_FS_XIP is not set 854# CONFIG_EXT2_FS_XIP is not set
830CONFIG_EXT3_FS=y 855CONFIG_EXT3_FS=y
856# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
831# CONFIG_EXT3_FS_XATTR is not set 857# CONFIG_EXT3_FS_XATTR is not set
832# CONFIG_EXT4_FS is not set 858# CONFIG_EXT4_FS is not set
833CONFIG_JBD=y 859CONFIG_JBD=y
@@ -854,13 +880,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
854# CONFIG_OCFS2_FS_STATS is not set 880# CONFIG_OCFS2_FS_STATS is not set
855# CONFIG_OCFS2_DEBUG_MASKLOG is not set 881# CONFIG_OCFS2_DEBUG_MASKLOG is not set
856# CONFIG_OCFS2_DEBUG_FS is not set 882# CONFIG_OCFS2_DEBUG_FS is not set
857# CONFIG_OCFS2_COMPAT_JBD is not set 883# CONFIG_OCFS2_FS_POSIX_ACL is not set
884# CONFIG_BTRFS_FS is not set
858CONFIG_DNOTIFY=y 885CONFIG_DNOTIFY=y
859CONFIG_INOTIFY=y 886CONFIG_INOTIFY=y
860CONFIG_INOTIFY_USER=y 887CONFIG_INOTIFY_USER=y
861CONFIG_QUOTA=y 888CONFIG_QUOTA=y
862CONFIG_QUOTA_NETLINK_INTERFACE=y 889CONFIG_QUOTA_NETLINK_INTERFACE=y
863# CONFIG_PRINT_QUOTA_WARNING is not set 890# CONFIG_PRINT_QUOTA_WARNING is not set
891CONFIG_QUOTA_TREE=m
864# CONFIG_QFMT_V1 is not set 892# CONFIG_QFMT_V1 is not set
865# CONFIG_QFMT_V2 is not set 893# CONFIG_QFMT_V2 is not set
866CONFIG_QUOTACTL=y 894CONFIG_QUOTACTL=y
@@ -869,6 +897,11 @@ CONFIG_AUTOFS4_FS=m
869CONFIG_FUSE_FS=m 897CONFIG_FUSE_FS=m
870 898
871# 899#
900# Caches
901#
902# CONFIG_FSCACHE is not set
903
904#
872# CD-ROM/DVD Filesystems 905# CD-ROM/DVD Filesystems
873# 906#
874CONFIG_ISO9660_FS=y 907CONFIG_ISO9660_FS=y
@@ -899,10 +932,7 @@ CONFIG_TMPFS=y
899# CONFIG_TMPFS_POSIX_ACL is not set 932# CONFIG_TMPFS_POSIX_ACL is not set
900# CONFIG_HUGETLB_PAGE is not set 933# CONFIG_HUGETLB_PAGE is not set
901CONFIG_CONFIGFS_FS=m 934CONFIG_CONFIGFS_FS=m
902 935CONFIG_MISC_FILESYSTEMS=y
903#
904# Miscellaneous filesystems
905#
906# CONFIG_ADFS_FS is not set 936# CONFIG_ADFS_FS is not set
907CONFIG_AFFS_FS=m 937CONFIG_AFFS_FS=m
908CONFIG_HFS_FS=m 938CONFIG_HFS_FS=m
@@ -911,6 +941,9 @@ CONFIG_HFSPLUS_FS=m
911# CONFIG_BFS_FS is not set 941# CONFIG_BFS_FS is not set
912# CONFIG_EFS_FS is not set 942# CONFIG_EFS_FS is not set
913CONFIG_CRAMFS=m 943CONFIG_CRAMFS=m
944CONFIG_SQUASHFS=m
945# CONFIG_SQUASHFS_EMBEDDED is not set
946CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
914# CONFIG_VXFS_FS is not set 947# CONFIG_VXFS_FS is not set
915CONFIG_MINIX_FS=y 948CONFIG_MINIX_FS=y
916# CONFIG_OMFS_FS is not set 949# CONFIG_OMFS_FS is not set
@@ -921,6 +954,7 @@ CONFIG_SYSV_FS=m
921CONFIG_UFS_FS=m 954CONFIG_UFS_FS=m
922# CONFIG_UFS_FS_WRITE is not set 955# CONFIG_UFS_FS_WRITE is not set
923# CONFIG_UFS_DEBUG is not set 956# CONFIG_UFS_DEBUG is not set
957# CONFIG_NILFS2_FS is not set
924CONFIG_NETWORK_FILESYSTEMS=y 958CONFIG_NETWORK_FILESYSTEMS=y
925CONFIG_NFS_FS=y 959CONFIG_NFS_FS=y
926CONFIG_NFS_V3=y 960CONFIG_NFS_V3=y
@@ -936,7 +970,6 @@ CONFIG_EXPORTFS=m
936CONFIG_NFS_COMMON=y 970CONFIG_NFS_COMMON=y
937CONFIG_SUNRPC=y 971CONFIG_SUNRPC=y
938CONFIG_SUNRPC_GSS=y 972CONFIG_SUNRPC_GSS=y
939# CONFIG_SUNRPC_REGISTER_V4 is not set
940CONFIG_RPCSEC_GSS_KRB5=y 973CONFIG_RPCSEC_GSS_KRB5=y
941# CONFIG_RPCSEC_GSS_SPKM3 is not set 974# CONFIG_RPCSEC_GSS_SPKM3 is not set
942CONFIG_SMB_FS=m 975CONFIG_SMB_FS=m
@@ -1011,11 +1044,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1011CONFIG_DEBUG_MEMORY_INIT=y 1044CONFIG_DEBUG_MEMORY_INIT=y
1012# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1045# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1013CONFIG_SYSCTL_SYSCALL_CHECK=y 1046CONFIG_SYSCTL_SYSCALL_CHECK=y
1014
1015#
1016# Tracers
1017#
1018# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1019# CONFIG_SAMPLES is not set 1047# CONFIG_SAMPLES is not set
1020 1048
1021# 1049#
@@ -1036,13 +1064,21 @@ CONFIG_CRYPTO=y
1036# 1064#
1037# CONFIG_CRYPTO_FIPS is not set 1065# CONFIG_CRYPTO_FIPS is not set
1038CONFIG_CRYPTO_ALGAPI=y 1066CONFIG_CRYPTO_ALGAPI=y
1039CONFIG_CRYPTO_AEAD=y 1067CONFIG_CRYPTO_ALGAPI2=y
1068CONFIG_CRYPTO_AEAD=m
1069CONFIG_CRYPTO_AEAD2=y
1040CONFIG_CRYPTO_BLKCIPHER=y 1070CONFIG_CRYPTO_BLKCIPHER=y
1071CONFIG_CRYPTO_BLKCIPHER2=y
1041CONFIG_CRYPTO_HASH=y 1072CONFIG_CRYPTO_HASH=y
1042CONFIG_CRYPTO_RNG=y 1073CONFIG_CRYPTO_HASH2=y
1074CONFIG_CRYPTO_RNG=m
1075CONFIG_CRYPTO_RNG2=y
1076CONFIG_CRYPTO_PCOMP=y
1043CONFIG_CRYPTO_MANAGER=y 1077CONFIG_CRYPTO_MANAGER=y
1078CONFIG_CRYPTO_MANAGER2=y
1044CONFIG_CRYPTO_GF128MUL=m 1079CONFIG_CRYPTO_GF128MUL=m
1045CONFIG_CRYPTO_NULL=m 1080CONFIG_CRYPTO_NULL=m
1081CONFIG_CRYPTO_WORKQUEUE=y
1046CONFIG_CRYPTO_CRYPTD=m 1082CONFIG_CRYPTO_CRYPTD=m
1047CONFIG_CRYPTO_AUTHENC=m 1083CONFIG_CRYPTO_AUTHENC=m
1048CONFIG_CRYPTO_TEST=m 1084CONFIG_CRYPTO_TEST=m
@@ -1112,6 +1148,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1112# Compression 1148# Compression
1113# 1149#
1114CONFIG_CRYPTO_DEFLATE=m 1150CONFIG_CRYPTO_DEFLATE=m
1151CONFIG_CRYPTO_ZLIB=m
1115CONFIG_CRYPTO_LZO=m 1152CONFIG_CRYPTO_LZO=m
1116 1153
1117# 1154#
@@ -1119,11 +1156,13 @@ CONFIG_CRYPTO_LZO=m
1119# 1156#
1120# CONFIG_CRYPTO_ANSI_CPRNG is not set 1157# CONFIG_CRYPTO_ANSI_CPRNG is not set
1121# CONFIG_CRYPTO_HW is not set 1158# CONFIG_CRYPTO_HW is not set
1159# CONFIG_BINARY_PRINTF is not set
1122 1160
1123# 1161#
1124# Library routines 1162# Library routines
1125# 1163#
1126CONFIG_BITREVERSE=y 1164CONFIG_BITREVERSE=y
1165CONFIG_GENERIC_FIND_LAST_BIT=y
1127CONFIG_CRC_CCITT=m 1166CONFIG_CRC_CCITT=m
1128CONFIG_CRC16=m 1167CONFIG_CRC16=m
1129CONFIG_CRC_T10DIF=y 1168CONFIG_CRC_T10DIF=y
@@ -1135,10 +1174,13 @@ CONFIG_ZLIB_INFLATE=y
1135CONFIG_ZLIB_DEFLATE=m 1174CONFIG_ZLIB_DEFLATE=m
1136CONFIG_LZO_COMPRESS=m 1175CONFIG_LZO_COMPRESS=m
1137CONFIG_LZO_DECOMPRESS=m 1176CONFIG_LZO_DECOMPRESS=m
1177CONFIG_DECOMPRESS_GZIP=y
1178CONFIG_DECOMPRESS_BZIP2=y
1179CONFIG_DECOMPRESS_LZMA=y
1138CONFIG_TEXTSEARCH=y 1180CONFIG_TEXTSEARCH=y
1139CONFIG_TEXTSEARCH_KMP=m 1181CONFIG_TEXTSEARCH_KMP=m
1140CONFIG_TEXTSEARCH_BM=m 1182CONFIG_TEXTSEARCH_BM=m
1141CONFIG_TEXTSEARCH_FSM=m 1183CONFIG_TEXTSEARCH_FSM=m
1142CONFIG_PLIST=y
1143CONFIG_HAS_IOMEM=y 1184CONFIG_HAS_IOMEM=y
1144CONFIG_HAS_DMA=y 1185CONFIG_HAS_DMA=y
1186CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index f404917429fa..f27c1a47bacf 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:53 2008 4# Wed Apr 22 20:48:16 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -138,12 +149,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
138CONFIG_NEED_MULTIPLE_NODES=y 149CONFIG_NEED_MULTIPLE_NODES=y
139CONFIG_PAGEFLAGS_EXTENDED=y 150CONFIG_PAGEFLAGS_EXTENDED=y
140CONFIG_SPLIT_PTLOCK_CPUS=4 151CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set
142# CONFIG_PHYS_ADDR_T_64BIT is not set 152# CONFIG_PHYS_ADDR_T_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1 153CONFIG_ZONE_DMA_FLAG=1
144CONFIG_BOUNCE=y 154CONFIG_BOUNCE=y
145CONFIG_VIRT_TO_BUS=y 155CONFIG_VIRT_TO_BUS=y
146CONFIG_UNEVICTABLE_LRU=y 156CONFIG_UNEVICTABLE_LRU=y
157CONFIG_HAVE_MLOCK=y
158CONFIG_HAVE_MLOCKED_PAGE_BIT=y
147 159
148# 160#
149# General setup 161# General setup
@@ -253,6 +265,7 @@ CONFIG_NETFILTER_XTABLES=m
253CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 265CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
254CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 266CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
255CONFIG_NETFILTER_XT_TARGET_DSCP=m 267CONFIG_NETFILTER_XT_TARGET_DSCP=m
268CONFIG_NETFILTER_XT_TARGET_HL=m
256CONFIG_NETFILTER_XT_TARGET_MARK=m 269CONFIG_NETFILTER_XT_TARGET_MARK=m
257CONFIG_NETFILTER_XT_TARGET_NFLOG=m 270CONFIG_NETFILTER_XT_TARGET_NFLOG=m
258CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 271CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -261,6 +274,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
261CONFIG_NETFILTER_XT_TARGET_TRACE=m 274CONFIG_NETFILTER_XT_TARGET_TRACE=m
262CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 275CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
263CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 276CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
277CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
264CONFIG_NETFILTER_XT_MATCH_COMMENT=m 278CONFIG_NETFILTER_XT_MATCH_COMMENT=m
265CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 279CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
266CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 280CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -271,6 +285,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
271CONFIG_NETFILTER_XT_MATCH_ESP=m 285CONFIG_NETFILTER_XT_MATCH_ESP=m
272CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 286CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
273CONFIG_NETFILTER_XT_MATCH_HELPER=m 287CONFIG_NETFILTER_XT_MATCH_HELPER=m
288CONFIG_NETFILTER_XT_MATCH_HL=m
274CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 289CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
275CONFIG_NETFILTER_XT_MATCH_LENGTH=m 290CONFIG_NETFILTER_XT_MATCH_LENGTH=m
276CONFIG_NETFILTER_XT_MATCH_LIMIT=m 291CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -349,25 +364,20 @@ CONFIG_IP6_NF_MATCH_HL=m
349CONFIG_IP6_NF_MATCH_IPV6HEADER=m 364CONFIG_IP6_NF_MATCH_IPV6HEADER=m
350CONFIG_IP6_NF_MATCH_MH=m 365CONFIG_IP6_NF_MATCH_MH=m
351CONFIG_IP6_NF_MATCH_RT=m 366CONFIG_IP6_NF_MATCH_RT=m
367CONFIG_IP6_NF_TARGET_HL=m
352CONFIG_IP6_NF_TARGET_LOG=m 368CONFIG_IP6_NF_TARGET_LOG=m
353CONFIG_IP6_NF_FILTER=m 369CONFIG_IP6_NF_FILTER=m
354CONFIG_IP6_NF_TARGET_REJECT=m 370CONFIG_IP6_NF_TARGET_REJECT=m
355CONFIG_IP6_NF_MANGLE=m 371CONFIG_IP6_NF_MANGLE=m
356CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_RAW=m 372CONFIG_IP6_NF_RAW=m
358CONFIG_IP_DCCP=m 373CONFIG_IP_DCCP=m
359CONFIG_INET_DCCP_DIAG=m 374CONFIG_INET_DCCP_DIAG=m
360CONFIG_IP_DCCP_ACKVEC=y
361 375
362# 376#
363# DCCP CCIDs Configuration (EXPERIMENTAL) 377# DCCP CCIDs Configuration (EXPERIMENTAL)
364# 378#
365CONFIG_IP_DCCP_CCID2=m
366# CONFIG_IP_DCCP_CCID2_DEBUG is not set 379# CONFIG_IP_DCCP_CCID2_DEBUG is not set
367CONFIG_IP_DCCP_CCID3=m 380# CONFIG_IP_DCCP_CCID3 is not set
368# CONFIG_IP_DCCP_CCID3_DEBUG is not set
369CONFIG_IP_DCCP_CCID3_RTO=100
370CONFIG_IP_DCCP_TFRC_LIB=m
371CONFIG_IP_SCTP=m 381CONFIG_IP_SCTP=m
372# CONFIG_SCTP_DBG_MSG is not set 382# CONFIG_SCTP_DBG_MSG is not set
373# CONFIG_SCTP_DBG_OBJCNT is not set 383# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -389,8 +399,10 @@ CONFIG_ATALK=m
389# CONFIG_LAPB is not set 399# CONFIG_LAPB is not set
390# CONFIG_ECONET is not set 400# CONFIG_ECONET is not set
391# CONFIG_WAN_ROUTER is not set 401# CONFIG_WAN_ROUTER is not set
402# CONFIG_PHONET is not set
392# CONFIG_NET_SCHED is not set 403# CONFIG_NET_SCHED is not set
393CONFIG_NET_CLS_ROUTE=y 404CONFIG_NET_CLS_ROUTE=y
405# CONFIG_DCB is not set
394 406
395# 407#
396# Network testing 408# Network testing
@@ -401,8 +413,8 @@ CONFIG_NET_CLS_ROUTE=y
401# CONFIG_IRDA is not set 413# CONFIG_IRDA is not set
402# CONFIG_BT is not set 414# CONFIG_BT is not set
403# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
404# CONFIG_PHONET is not set
405# CONFIG_WIRELESS is not set 416# CONFIG_WIRELESS is not set
417# CONFIG_WIMAX is not set
406# CONFIG_RFKILL is not set 418# CONFIG_RFKILL is not set
407# CONFIG_NET_9P is not set 419# CONFIG_NET_9P is not set
408 420
@@ -438,9 +450,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
438CONFIG_ATA_OVER_ETH=m 450CONFIG_ATA_OVER_ETH=m
439# CONFIG_BLK_DEV_HD is not set 451# CONFIG_BLK_DEV_HD is not set
440CONFIG_MISC_DEVICES=y 452CONFIG_MISC_DEVICES=y
441# CONFIG_EEPROM_93CX6 is not set
442# CONFIG_ENCLOSURE_SERVICES is not set 453# CONFIG_ENCLOSURE_SERVICES is not set
443# CONFIG_C2PORT is not set 454# CONFIG_C2PORT is not set
455
456#
457# EEPROM support
458#
459# CONFIG_EEPROM_93CX6 is not set
444CONFIG_HAVE_IDE=y 460CONFIG_HAVE_IDE=y
445# CONFIG_IDE is not set 461# CONFIG_IDE is not set
446 462
@@ -488,9 +504,12 @@ CONFIG_SCSI_SRP_ATTRS=m
488CONFIG_SCSI_SRP_TGT_ATTRS=y 504CONFIG_SCSI_SRP_TGT_ATTRS=y
489CONFIG_SCSI_LOWLEVEL=y 505CONFIG_SCSI_LOWLEVEL=y
490CONFIG_ISCSI_TCP=m 506CONFIG_ISCSI_TCP=m
507# CONFIG_LIBFC is not set
508# CONFIG_LIBFCOE is not set
491# CONFIG_SCSI_DEBUG is not set 509# CONFIG_SCSI_DEBUG is not set
492CONFIG_SUN3_SCSI=y 510CONFIG_SUN3_SCSI=y
493# CONFIG_SCSI_DH is not set 511# CONFIG_SCSI_DH is not set
512# CONFIG_SCSI_OSD_INITIATOR is not set
494CONFIG_MD=y 513CONFIG_MD=y
495CONFIG_BLK_DEV_MD=m 514CONFIG_BLK_DEV_MD=m
496CONFIG_MD_LINEAR=m 515CONFIG_MD_LINEAR=m
@@ -498,7 +517,7 @@ CONFIG_MD_RAID0=m
498CONFIG_MD_RAID1=m 517CONFIG_MD_RAID1=m
499# CONFIG_MD_RAID10 is not set 518# CONFIG_MD_RAID10 is not set
500CONFIG_MD_RAID456=m 519CONFIG_MD_RAID456=m
501CONFIG_MD_RAID5_RESHAPE=y 520CONFIG_MD_RAID6_PQ=m
502# CONFIG_MD_MULTIPATH is not set 521# CONFIG_MD_MULTIPATH is not set
503# CONFIG_MD_FAULTY is not set 522# CONFIG_MD_FAULTY is not set
504CONFIG_BLK_DEV_DM=m 523CONFIG_BLK_DEV_DM=m
@@ -511,6 +530,7 @@ CONFIG_DM_MULTIPATH=m
511# CONFIG_DM_DELAY is not set 530# CONFIG_DM_DELAY is not set
512CONFIG_DM_UEVENT=y 531CONFIG_DM_UEVENT=y
513CONFIG_NETDEVICES=y 532CONFIG_NETDEVICES=y
533CONFIG_COMPAT_NET_DEV_OPS=y
514CONFIG_DUMMY=m 534CONFIG_DUMMY=m
515# CONFIG_BONDING is not set 535# CONFIG_BONDING is not set
516CONFIG_MACVLAN=m 536CONFIG_MACVLAN=m
@@ -522,6 +542,8 @@ CONFIG_NET_ETHERNET=y
522# CONFIG_MII is not set 542# CONFIG_MII is not set
523CONFIG_SUN3LANCE=y 543CONFIG_SUN3LANCE=y
524CONFIG_SUN3_82586=y 544CONFIG_SUN3_82586=y
545# CONFIG_ETHOC is not set
546# CONFIG_DNET is not set
525# CONFIG_IBM_NEW_EMAC_ZMII is not set 547# CONFIG_IBM_NEW_EMAC_ZMII is not set
526# CONFIG_IBM_NEW_EMAC_RGMII is not set 548# CONFIG_IBM_NEW_EMAC_RGMII is not set
527# CONFIG_IBM_NEW_EMAC_TAH is not set 549# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -537,7 +559,10 @@ CONFIG_SUN3_82586=y
537# 559#
538# CONFIG_WLAN_PRE80211 is not set 560# CONFIG_WLAN_PRE80211 is not set
539# CONFIG_WLAN_80211 is not set 561# CONFIG_WLAN_80211 is not set
540# CONFIG_IWLWIFI_LEDS is not set 562
563#
564# Enable WiMAX (Networking options) to see the WiMAX drivers
565#
541# CONFIG_WAN is not set 566# CONFIG_WAN is not set
542CONFIG_PPP=m 567CONFIG_PPP=m
543# CONFIG_PPP_MULTILINK is not set 568# CONFIG_PPP_MULTILINK is not set
@@ -595,7 +620,6 @@ CONFIG_MOUSE_PS2=m
595CONFIG_MOUSE_PS2_ALPS=y 620CONFIG_MOUSE_PS2_ALPS=y
596CONFIG_MOUSE_PS2_LOGIPS2PP=y 621CONFIG_MOUSE_PS2_LOGIPS2PP=y
597CONFIG_MOUSE_PS2_SYNAPTICS=y 622CONFIG_MOUSE_PS2_SYNAPTICS=y
598CONFIG_MOUSE_PS2_LIFEBOOK=y
599CONFIG_MOUSE_PS2_TRACKPOINT=y 623CONFIG_MOUSE_PS2_TRACKPOINT=y
600# CONFIG_MOUSE_PS2_ELANTECH is not set 624# CONFIG_MOUSE_PS2_ELANTECH is not set
601# CONFIG_MOUSE_PS2_TOUCHKIT is not set 625# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -635,6 +659,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
635# Non-8250 serial port support 659# Non-8250 serial port support
636# 660#
637CONFIG_UNIX98_PTYS=y 661CONFIG_UNIX98_PTYS=y
662# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
638CONFIG_LEGACY_PTYS=y 663CONFIG_LEGACY_PTYS=y
639CONFIG_LEGACY_PTY_COUNT=256 664CONFIG_LEGACY_PTY_COUNT=256
640# CONFIG_IPMI_HANDLER is not set 665# CONFIG_IPMI_HANDLER is not set
@@ -710,6 +735,7 @@ CONFIG_FB=y
710# CONFIG_FB_VIRTUAL is not set 735# CONFIG_FB_VIRTUAL is not set
711# CONFIG_FB_METRONOME is not set 736# CONFIG_FB_METRONOME is not set
712# CONFIG_FB_MB862XX is not set 737# CONFIG_FB_MB862XX is not set
738# CONFIG_FB_BROADSHEET is not set
713# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 739# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
714 740
715# 741#
@@ -741,16 +767,15 @@ CONFIG_HIDRAW=y
741# 767#
742# Special HID drivers 768# Special HID drivers
743# 769#
744CONFIG_HID_COMPAT=y
745# CONFIG_USB_SUPPORT is not set 770# CONFIG_USB_SUPPORT is not set
746# CONFIG_MMC is not set 771# CONFIG_MMC is not set
747# CONFIG_MEMSTICK is not set 772# CONFIG_MEMSTICK is not set
748# CONFIG_NEW_LEDS is not set 773# CONFIG_NEW_LEDS is not set
749# CONFIG_ACCESSIBILITY is not set 774# CONFIG_ACCESSIBILITY is not set
750# CONFIG_RTC_CLASS is not set 775# CONFIG_RTC_CLASS is not set
776# CONFIG_AUXDISPLAY is not set
751# CONFIG_UIO is not set 777# CONFIG_UIO is not set
752# CONFIG_STAGING is not set 778# CONFIG_STAGING is not set
753CONFIG_STAGING_EXCLUDE_BUILD=y
754 779
755# 780#
756# Character devices 781# Character devices
@@ -763,6 +788,7 @@ CONFIG_EXT2_FS=y
763# CONFIG_EXT2_FS_XATTR is not set 788# CONFIG_EXT2_FS_XATTR is not set
764# CONFIG_EXT2_FS_XIP is not set 789# CONFIG_EXT2_FS_XIP is not set
765CONFIG_EXT3_FS=y 790CONFIG_EXT3_FS=y
791# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
766# CONFIG_EXT3_FS_XATTR is not set 792# CONFIG_EXT3_FS_XATTR is not set
767# CONFIG_EXT4_FS is not set 793# CONFIG_EXT4_FS is not set
768CONFIG_JBD=y 794CONFIG_JBD=y
@@ -789,13 +815,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
789# CONFIG_OCFS2_FS_STATS is not set 815# CONFIG_OCFS2_FS_STATS is not set
790# CONFIG_OCFS2_DEBUG_MASKLOG is not set 816# CONFIG_OCFS2_DEBUG_MASKLOG is not set
791# CONFIG_OCFS2_DEBUG_FS is not set 817# CONFIG_OCFS2_DEBUG_FS is not set
792# CONFIG_OCFS2_COMPAT_JBD is not set 818# CONFIG_OCFS2_FS_POSIX_ACL is not set
819# CONFIG_BTRFS_FS is not set
793CONFIG_DNOTIFY=y 820CONFIG_DNOTIFY=y
794CONFIG_INOTIFY=y 821CONFIG_INOTIFY=y
795CONFIG_INOTIFY_USER=y 822CONFIG_INOTIFY_USER=y
796CONFIG_QUOTA=y 823CONFIG_QUOTA=y
797CONFIG_QUOTA_NETLINK_INTERFACE=y 824CONFIG_QUOTA_NETLINK_INTERFACE=y
798# CONFIG_PRINT_QUOTA_WARNING is not set 825# CONFIG_PRINT_QUOTA_WARNING is not set
826CONFIG_QUOTA_TREE=m
799# CONFIG_QFMT_V1 is not set 827# CONFIG_QFMT_V1 is not set
800# CONFIG_QFMT_V2 is not set 828# CONFIG_QFMT_V2 is not set
801CONFIG_QUOTACTL=y 829CONFIG_QUOTACTL=y
@@ -804,6 +832,11 @@ CONFIG_AUTOFS4_FS=m
804CONFIG_FUSE_FS=m 832CONFIG_FUSE_FS=m
805 833
806# 834#
835# Caches
836#
837# CONFIG_FSCACHE is not set
838
839#
807# CD-ROM/DVD Filesystems 840# CD-ROM/DVD Filesystems
808# 841#
809CONFIG_ISO9660_FS=y 842CONFIG_ISO9660_FS=y
@@ -834,10 +867,7 @@ CONFIG_TMPFS=y
834# CONFIG_TMPFS_POSIX_ACL is not set 867# CONFIG_TMPFS_POSIX_ACL is not set
835# CONFIG_HUGETLB_PAGE is not set 868# CONFIG_HUGETLB_PAGE is not set
836CONFIG_CONFIGFS_FS=m 869CONFIG_CONFIGFS_FS=m
837 870CONFIG_MISC_FILESYSTEMS=y
838#
839# Miscellaneous filesystems
840#
841# CONFIG_ADFS_FS is not set 871# CONFIG_ADFS_FS is not set
842CONFIG_AFFS_FS=m 872CONFIG_AFFS_FS=m
843CONFIG_HFS_FS=m 873CONFIG_HFS_FS=m
@@ -846,6 +876,9 @@ CONFIG_HFSPLUS_FS=m
846# CONFIG_BFS_FS is not set 876# CONFIG_BFS_FS is not set
847# CONFIG_EFS_FS is not set 877# CONFIG_EFS_FS is not set
848CONFIG_CRAMFS=m 878CONFIG_CRAMFS=m
879CONFIG_SQUASHFS=m
880# CONFIG_SQUASHFS_EMBEDDED is not set
881CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
849# CONFIG_VXFS_FS is not set 882# CONFIG_VXFS_FS is not set
850CONFIG_MINIX_FS=y 883CONFIG_MINIX_FS=y
851# CONFIG_OMFS_FS is not set 884# CONFIG_OMFS_FS is not set
@@ -856,6 +889,7 @@ CONFIG_SYSV_FS=m
856CONFIG_UFS_FS=m 889CONFIG_UFS_FS=m
857# CONFIG_UFS_FS_WRITE is not set 890# CONFIG_UFS_FS_WRITE is not set
858# CONFIG_UFS_DEBUG is not set 891# CONFIG_UFS_DEBUG is not set
892# CONFIG_NILFS2_FS is not set
859CONFIG_NETWORK_FILESYSTEMS=y 893CONFIG_NETWORK_FILESYSTEMS=y
860CONFIG_NFS_FS=y 894CONFIG_NFS_FS=y
861CONFIG_NFS_V3=y 895CONFIG_NFS_V3=y
@@ -872,7 +906,6 @@ CONFIG_EXPORTFS=m
872CONFIG_NFS_COMMON=y 906CONFIG_NFS_COMMON=y
873CONFIG_SUNRPC=y 907CONFIG_SUNRPC=y
874CONFIG_SUNRPC_GSS=y 908CONFIG_SUNRPC_GSS=y
875# CONFIG_SUNRPC_REGISTER_V4 is not set
876CONFIG_RPCSEC_GSS_KRB5=y 909CONFIG_RPCSEC_GSS_KRB5=y
877# CONFIG_RPCSEC_GSS_SPKM3 is not set 910# CONFIG_RPCSEC_GSS_SPKM3 is not set
878CONFIG_SMB_FS=m 911CONFIG_SMB_FS=m
@@ -948,11 +981,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
948CONFIG_DEBUG_MEMORY_INIT=y 981CONFIG_DEBUG_MEMORY_INIT=y
949# CONFIG_RCU_CPU_STALL_DETECTOR is not set 982# CONFIG_RCU_CPU_STALL_DETECTOR is not set
950CONFIG_SYSCTL_SYSCALL_CHECK=y 983CONFIG_SYSCTL_SYSCALL_CHECK=y
951
952#
953# Tracers
954#
955# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
956# CONFIG_SAMPLES is not set 984# CONFIG_SAMPLES is not set
957 985
958# 986#
@@ -973,13 +1001,21 @@ CONFIG_CRYPTO=y
973# 1001#
974# CONFIG_CRYPTO_FIPS is not set 1002# CONFIG_CRYPTO_FIPS is not set
975CONFIG_CRYPTO_ALGAPI=y 1003CONFIG_CRYPTO_ALGAPI=y
976CONFIG_CRYPTO_AEAD=y 1004CONFIG_CRYPTO_ALGAPI2=y
1005CONFIG_CRYPTO_AEAD=m
1006CONFIG_CRYPTO_AEAD2=y
977CONFIG_CRYPTO_BLKCIPHER=y 1007CONFIG_CRYPTO_BLKCIPHER=y
1008CONFIG_CRYPTO_BLKCIPHER2=y
978CONFIG_CRYPTO_HASH=y 1009CONFIG_CRYPTO_HASH=y
979CONFIG_CRYPTO_RNG=y 1010CONFIG_CRYPTO_HASH2=y
1011CONFIG_CRYPTO_RNG=m
1012CONFIG_CRYPTO_RNG2=y
1013CONFIG_CRYPTO_PCOMP=y
980CONFIG_CRYPTO_MANAGER=y 1014CONFIG_CRYPTO_MANAGER=y
1015CONFIG_CRYPTO_MANAGER2=y
981CONFIG_CRYPTO_GF128MUL=m 1016CONFIG_CRYPTO_GF128MUL=m
982CONFIG_CRYPTO_NULL=m 1017CONFIG_CRYPTO_NULL=m
1018CONFIG_CRYPTO_WORKQUEUE=y
983CONFIG_CRYPTO_CRYPTD=m 1019CONFIG_CRYPTO_CRYPTD=m
984CONFIG_CRYPTO_AUTHENC=m 1020CONFIG_CRYPTO_AUTHENC=m
985CONFIG_CRYPTO_TEST=m 1021CONFIG_CRYPTO_TEST=m
@@ -1049,6 +1085,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1049# Compression 1085# Compression
1050# 1086#
1051CONFIG_CRYPTO_DEFLATE=m 1087CONFIG_CRYPTO_DEFLATE=m
1088CONFIG_CRYPTO_ZLIB=m
1052CONFIG_CRYPTO_LZO=m 1089CONFIG_CRYPTO_LZO=m
1053 1090
1054# 1091#
@@ -1056,11 +1093,13 @@ CONFIG_CRYPTO_LZO=m
1056# 1093#
1057# CONFIG_CRYPTO_ANSI_CPRNG is not set 1094# CONFIG_CRYPTO_ANSI_CPRNG is not set
1058# CONFIG_CRYPTO_HW is not set 1095# CONFIG_CRYPTO_HW is not set
1096# CONFIG_BINARY_PRINTF is not set
1059 1097
1060# 1098#
1061# Library routines 1099# Library routines
1062# 1100#
1063CONFIG_BITREVERSE=y 1101CONFIG_BITREVERSE=y
1102CONFIG_GENERIC_FIND_LAST_BIT=y
1064CONFIG_CRC_CCITT=m 1103CONFIG_CRC_CCITT=m
1065CONFIG_CRC16=m 1104CONFIG_CRC16=m
1066CONFIG_CRC_T10DIF=y 1105CONFIG_CRC_T10DIF=y
@@ -1072,9 +1111,12 @@ CONFIG_ZLIB_INFLATE=y
1072CONFIG_ZLIB_DEFLATE=m 1111CONFIG_ZLIB_DEFLATE=m
1073CONFIG_LZO_COMPRESS=m 1112CONFIG_LZO_COMPRESS=m
1074CONFIG_LZO_DECOMPRESS=m 1113CONFIG_LZO_DECOMPRESS=m
1114CONFIG_DECOMPRESS_GZIP=y
1115CONFIG_DECOMPRESS_BZIP2=y
1116CONFIG_DECOMPRESS_LZMA=y
1075CONFIG_TEXTSEARCH=y 1117CONFIG_TEXTSEARCH=y
1076CONFIG_TEXTSEARCH_KMP=m 1118CONFIG_TEXTSEARCH_KMP=m
1077CONFIG_TEXTSEARCH_BM=m 1119CONFIG_TEXTSEARCH_BM=m
1078CONFIG_TEXTSEARCH_FSM=m 1120CONFIG_TEXTSEARCH_FSM=m
1079CONFIG_PLIST=y
1080CONFIG_HAS_IOMEM=y 1121CONFIG_HAS_IOMEM=y
1122CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 4d8a1e84e39f..c40edb919fda 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_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.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:54 2008 4# Wed Apr 22 20:48:20 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m
255CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 267CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
256CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 268CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
257CONFIG_NETFILTER_XT_TARGET_DSCP=m 269CONFIG_NETFILTER_XT_TARGET_DSCP=m
270CONFIG_NETFILTER_XT_TARGET_HL=m
258CONFIG_NETFILTER_XT_TARGET_MARK=m 271CONFIG_NETFILTER_XT_TARGET_MARK=m
259CONFIG_NETFILTER_XT_TARGET_NFLOG=m 272CONFIG_NETFILTER_XT_TARGET_NFLOG=m
260CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
263CONFIG_NETFILTER_XT_TARGET_TRACE=m 276CONFIG_NETFILTER_XT_TARGET_TRACE=m
264CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
265CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
279CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
266CONFIG_NETFILTER_XT_MATCH_COMMENT=m 280CONFIG_NETFILTER_XT_MATCH_COMMENT=m
267CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 281CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
268CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 282CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
273CONFIG_NETFILTER_XT_MATCH_ESP=m 287CONFIG_NETFILTER_XT_MATCH_ESP=m
274CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
275CONFIG_NETFILTER_XT_MATCH_HELPER=m 289CONFIG_NETFILTER_XT_MATCH_HELPER=m
290CONFIG_NETFILTER_XT_MATCH_HL=m
276CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 291CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
277CONFIG_NETFILTER_XT_MATCH_LENGTH=m 292CONFIG_NETFILTER_XT_MATCH_LENGTH=m
278CONFIG_NETFILTER_XT_MATCH_LIMIT=m 293CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m
351CONFIG_IP6_NF_MATCH_IPV6HEADER=m 366CONFIG_IP6_NF_MATCH_IPV6HEADER=m
352CONFIG_IP6_NF_MATCH_MH=m 367CONFIG_IP6_NF_MATCH_MH=m
353CONFIG_IP6_NF_MATCH_RT=m 368CONFIG_IP6_NF_MATCH_RT=m
369CONFIG_IP6_NF_TARGET_HL=m
354CONFIG_IP6_NF_TARGET_LOG=m 370CONFIG_IP6_NF_TARGET_LOG=m
355CONFIG_IP6_NF_FILTER=m 371CONFIG_IP6_NF_FILTER=m
356CONFIG_IP6_NF_TARGET_REJECT=m 372CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 373CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 374CONFIG_IP6_NF_RAW=m
360CONFIG_IP_DCCP=m 375CONFIG_IP_DCCP=m
361CONFIG_INET_DCCP_DIAG=m 376CONFIG_INET_DCCP_DIAG=m
362CONFIG_IP_DCCP_ACKVEC=y
363 377
364# 378#
365# DCCP CCIDs Configuration (EXPERIMENTAL) 379# DCCP CCIDs Configuration (EXPERIMENTAL)
366# 380#
367CONFIG_IP_DCCP_CCID2=m
368# CONFIG_IP_DCCP_CCID2_DEBUG is not set 381# CONFIG_IP_DCCP_CCID2_DEBUG is not set
369CONFIG_IP_DCCP_CCID3=m 382# CONFIG_IP_DCCP_CCID3 is not set
370# CONFIG_IP_DCCP_CCID3_DEBUG is not set
371CONFIG_IP_DCCP_CCID3_RTO=100
372CONFIG_IP_DCCP_TFRC_LIB=m
373CONFIG_IP_SCTP=m 383CONFIG_IP_SCTP=m
374# CONFIG_SCTP_DBG_MSG is not set 384# CONFIG_SCTP_DBG_MSG is not set
375# CONFIG_SCTP_DBG_OBJCNT is not set 385# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -391,8 +401,10 @@ CONFIG_ATALK=m
391# CONFIG_LAPB is not set 401# CONFIG_LAPB is not set
392# CONFIG_ECONET is not set 402# CONFIG_ECONET is not set
393# CONFIG_WAN_ROUTER is not set 403# CONFIG_WAN_ROUTER is not set
404# CONFIG_PHONET is not set
394# CONFIG_NET_SCHED is not set 405# CONFIG_NET_SCHED is not set
395CONFIG_NET_CLS_ROUTE=y 406CONFIG_NET_CLS_ROUTE=y
407# CONFIG_DCB is not set
396 408
397# 409#
398# Network testing 410# Network testing
@@ -403,8 +415,8 @@ CONFIG_NET_CLS_ROUTE=y
403# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
404# CONFIG_BT is not set 416# CONFIG_BT is not set
405# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
406# CONFIG_PHONET is not set
407# CONFIG_WIRELESS is not set 418# CONFIG_WIRELESS is not set
419# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
410 422
@@ -440,9 +452,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
440CONFIG_ATA_OVER_ETH=m 452CONFIG_ATA_OVER_ETH=m
441# CONFIG_BLK_DEV_HD is not set 453# CONFIG_BLK_DEV_HD is not set
442CONFIG_MISC_DEVICES=y 454CONFIG_MISC_DEVICES=y
443# CONFIG_EEPROM_93CX6 is not set
444# CONFIG_ENCLOSURE_SERVICES is not set 455# CONFIG_ENCLOSURE_SERVICES is not set
445# CONFIG_C2PORT is not set 456# CONFIG_C2PORT is not set
457
458#
459# EEPROM support
460#
461# CONFIG_EEPROM_93CX6 is not set
446CONFIG_HAVE_IDE=y 462CONFIG_HAVE_IDE=y
447# CONFIG_IDE is not set 463# CONFIG_IDE is not set
448 464
@@ -490,9 +506,12 @@ CONFIG_SCSI_SRP_ATTRS=m
490CONFIG_SCSI_SRP_TGT_ATTRS=y 506CONFIG_SCSI_SRP_TGT_ATTRS=y
491CONFIG_SCSI_LOWLEVEL=y 507CONFIG_SCSI_LOWLEVEL=y
492CONFIG_ISCSI_TCP=m 508CONFIG_ISCSI_TCP=m
509# CONFIG_LIBFC is not set
510# CONFIG_LIBFCOE is not set
493# CONFIG_SCSI_DEBUG is not set 511# CONFIG_SCSI_DEBUG is not set
494CONFIG_SUN3X_ESP=y 512CONFIG_SUN3X_ESP=y
495# CONFIG_SCSI_DH is not set 513# CONFIG_SCSI_DH is not set
514# CONFIG_SCSI_OSD_INITIATOR is not set
496CONFIG_MD=y 515CONFIG_MD=y
497CONFIG_BLK_DEV_MD=m 516CONFIG_BLK_DEV_MD=m
498CONFIG_MD_LINEAR=m 517CONFIG_MD_LINEAR=m
@@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m
500CONFIG_MD_RAID1=m 519CONFIG_MD_RAID1=m
501# CONFIG_MD_RAID10 is not set 520# CONFIG_MD_RAID10 is not set
502CONFIG_MD_RAID456=m 521CONFIG_MD_RAID456=m
503CONFIG_MD_RAID5_RESHAPE=y 522CONFIG_MD_RAID6_PQ=m
504# CONFIG_MD_MULTIPATH is not set 523# CONFIG_MD_MULTIPATH is not set
505# CONFIG_MD_FAULTY is not set 524# CONFIG_MD_FAULTY is not set
506CONFIG_BLK_DEV_DM=m 525CONFIG_BLK_DEV_DM=m
@@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m
513# CONFIG_DM_DELAY is not set 532# CONFIG_DM_DELAY is not set
514CONFIG_DM_UEVENT=y 533CONFIG_DM_UEVENT=y
515CONFIG_NETDEVICES=y 534CONFIG_NETDEVICES=y
535CONFIG_COMPAT_NET_DEV_OPS=y
516CONFIG_DUMMY=m 536CONFIG_DUMMY=m
517# CONFIG_BONDING is not set 537# CONFIG_BONDING is not set
518CONFIG_MACVLAN=m 538CONFIG_MACVLAN=m
@@ -523,6 +543,8 @@ CONFIG_VETH=m
523CONFIG_NET_ETHERNET=y 543CONFIG_NET_ETHERNET=y
524# CONFIG_MII is not set 544# CONFIG_MII is not set
525CONFIG_SUN3LANCE=y 545CONFIG_SUN3LANCE=y
546# CONFIG_ETHOC is not set
547# CONFIG_DNET is not set
526# CONFIG_IBM_NEW_EMAC_ZMII is not set 548# CONFIG_IBM_NEW_EMAC_ZMII is not set
527# CONFIG_IBM_NEW_EMAC_RGMII is not set 549# CONFIG_IBM_NEW_EMAC_RGMII is not set
528# CONFIG_IBM_NEW_EMAC_TAH is not set 550# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -539,7 +561,10 @@ CONFIG_SUN3LANCE=y
539# 561#
540# CONFIG_WLAN_PRE80211 is not set 562# CONFIG_WLAN_PRE80211 is not set
541# CONFIG_WLAN_80211 is not set 563# CONFIG_WLAN_80211 is not set
542# CONFIG_IWLWIFI_LEDS is not set 564
565#
566# Enable WiMAX (Networking options) to see the WiMAX drivers
567#
543# CONFIG_WAN is not set 568# CONFIG_WAN is not set
544CONFIG_PPP=m 569CONFIG_PPP=m
545# CONFIG_PPP_MULTILINK is not set 570# CONFIG_PPP_MULTILINK is not set
@@ -597,7 +622,6 @@ CONFIG_MOUSE_PS2=m
597CONFIG_MOUSE_PS2_ALPS=y 622CONFIG_MOUSE_PS2_ALPS=y
598CONFIG_MOUSE_PS2_LOGIPS2PP=y 623CONFIG_MOUSE_PS2_LOGIPS2PP=y
599CONFIG_MOUSE_PS2_SYNAPTICS=y 624CONFIG_MOUSE_PS2_SYNAPTICS=y
600CONFIG_MOUSE_PS2_LIFEBOOK=y
601CONFIG_MOUSE_PS2_TRACKPOINT=y 625CONFIG_MOUSE_PS2_TRACKPOINT=y
602# CONFIG_MOUSE_PS2_ELANTECH is not set 626# CONFIG_MOUSE_PS2_ELANTECH is not set
603# CONFIG_MOUSE_PS2_TOUCHKIT is not set 627# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -637,6 +661,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
637# Non-8250 serial port support 661# Non-8250 serial port support
638# 662#
639CONFIG_UNIX98_PTYS=y 663CONFIG_UNIX98_PTYS=y
664# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
640CONFIG_LEGACY_PTYS=y 665CONFIG_LEGACY_PTYS=y
641CONFIG_LEGACY_PTY_COUNT=256 666CONFIG_LEGACY_PTY_COUNT=256
642# CONFIG_IPMI_HANDLER is not set 667# CONFIG_IPMI_HANDLER is not set
@@ -718,6 +743,7 @@ CONFIG_FB=y
718# CONFIG_FB_VIRTUAL is not set 743# CONFIG_FB_VIRTUAL is not set
719# CONFIG_FB_METRONOME is not set 744# CONFIG_FB_METRONOME is not set
720# CONFIG_FB_MB862XX is not set 745# CONFIG_FB_MB862XX is not set
746# CONFIG_FB_BROADSHEET is not set
721# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 747# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
722 748
723# 749#
@@ -749,7 +775,6 @@ CONFIG_HIDRAW=y
749# 775#
750# Special HID drivers 776# Special HID drivers
751# 777#
752CONFIG_HID_COMPAT=y
753# CONFIG_USB_SUPPORT is not set 778# CONFIG_USB_SUPPORT is not set
754# CONFIG_MMC is not set 779# CONFIG_MMC is not set
755# CONFIG_MEMSTICK is not set 780# CONFIG_MEMSTICK is not set
@@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y
757# CONFIG_ACCESSIBILITY is not set 782# CONFIG_ACCESSIBILITY is not set
758# CONFIG_RTC_CLASS is not set 783# CONFIG_RTC_CLASS is not set
759# CONFIG_DMADEVICES is not set 784# CONFIG_DMADEVICES is not set
785# CONFIG_AUXDISPLAY is not set
760# CONFIG_UIO is not set 786# CONFIG_UIO is not set
761# CONFIG_STAGING is not set 787# CONFIG_STAGING is not set
762CONFIG_STAGING_EXCLUDE_BUILD=y
763 788
764# 789#
765# Character devices 790# Character devices
@@ -772,6 +797,7 @@ CONFIG_EXT2_FS=y
772# CONFIG_EXT2_FS_XATTR is not set 797# CONFIG_EXT2_FS_XATTR is not set
773# CONFIG_EXT2_FS_XIP is not set 798# CONFIG_EXT2_FS_XIP is not set
774CONFIG_EXT3_FS=y 799CONFIG_EXT3_FS=y
800# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
775# CONFIG_EXT3_FS_XATTR is not set 801# CONFIG_EXT3_FS_XATTR is not set
776# CONFIG_EXT4_FS is not set 802# CONFIG_EXT4_FS is not set
777CONFIG_JBD=y 803CONFIG_JBD=y
@@ -798,13 +824,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
798# CONFIG_OCFS2_FS_STATS is not set 824# CONFIG_OCFS2_FS_STATS is not set
799# CONFIG_OCFS2_DEBUG_MASKLOG is not set 825# CONFIG_OCFS2_DEBUG_MASKLOG is not set
800# CONFIG_OCFS2_DEBUG_FS is not set 826# CONFIG_OCFS2_DEBUG_FS is not set
801# CONFIG_OCFS2_COMPAT_JBD is not set 827# CONFIG_OCFS2_FS_POSIX_ACL is not set
828# CONFIG_BTRFS_FS is not set
802CONFIG_DNOTIFY=y 829CONFIG_DNOTIFY=y
803CONFIG_INOTIFY=y 830CONFIG_INOTIFY=y
804CONFIG_INOTIFY_USER=y 831CONFIG_INOTIFY_USER=y
805CONFIG_QUOTA=y 832CONFIG_QUOTA=y
806CONFIG_QUOTA_NETLINK_INTERFACE=y 833CONFIG_QUOTA_NETLINK_INTERFACE=y
807# CONFIG_PRINT_QUOTA_WARNING is not set 834# CONFIG_PRINT_QUOTA_WARNING is not set
835CONFIG_QUOTA_TREE=m
808# CONFIG_QFMT_V1 is not set 836# CONFIG_QFMT_V1 is not set
809# CONFIG_QFMT_V2 is not set 837# CONFIG_QFMT_V2 is not set
810CONFIG_QUOTACTL=y 838CONFIG_QUOTACTL=y
@@ -813,6 +841,11 @@ CONFIG_AUTOFS4_FS=m
813CONFIG_FUSE_FS=m 841CONFIG_FUSE_FS=m
814 842
815# 843#
844# Caches
845#
846# CONFIG_FSCACHE is not set
847
848#
816# CD-ROM/DVD Filesystems 849# CD-ROM/DVD Filesystems
817# 850#
818CONFIG_ISO9660_FS=y 851CONFIG_ISO9660_FS=y
@@ -843,10 +876,7 @@ CONFIG_TMPFS=y
843# CONFIG_TMPFS_POSIX_ACL is not set 876# CONFIG_TMPFS_POSIX_ACL is not set
844# CONFIG_HUGETLB_PAGE is not set 877# CONFIG_HUGETLB_PAGE is not set
845CONFIG_CONFIGFS_FS=m 878CONFIG_CONFIGFS_FS=m
846 879CONFIG_MISC_FILESYSTEMS=y
847#
848# Miscellaneous filesystems
849#
850# CONFIG_ADFS_FS is not set 880# CONFIG_ADFS_FS is not set
851CONFIG_AFFS_FS=m 881CONFIG_AFFS_FS=m
852CONFIG_HFS_FS=m 882CONFIG_HFS_FS=m
@@ -855,6 +885,9 @@ CONFIG_HFSPLUS_FS=m
855# CONFIG_BFS_FS is not set 885# CONFIG_BFS_FS is not set
856# CONFIG_EFS_FS is not set 886# CONFIG_EFS_FS is not set
857CONFIG_CRAMFS=m 887CONFIG_CRAMFS=m
888CONFIG_SQUASHFS=m
889# CONFIG_SQUASHFS_EMBEDDED is not set
890CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
858# CONFIG_VXFS_FS is not set 891# CONFIG_VXFS_FS is not set
859CONFIG_MINIX_FS=y 892CONFIG_MINIX_FS=y
860# CONFIG_OMFS_FS is not set 893# CONFIG_OMFS_FS is not set
@@ -865,6 +898,7 @@ CONFIG_SYSV_FS=m
865CONFIG_UFS_FS=m 898CONFIG_UFS_FS=m
866# CONFIG_UFS_FS_WRITE is not set 899# CONFIG_UFS_FS_WRITE is not set
867# CONFIG_UFS_DEBUG is not set 900# CONFIG_UFS_DEBUG is not set
901# CONFIG_NILFS2_FS is not set
868CONFIG_NETWORK_FILESYSTEMS=y 902CONFIG_NETWORK_FILESYSTEMS=y
869CONFIG_NFS_FS=y 903CONFIG_NFS_FS=y
870CONFIG_NFS_V3=y 904CONFIG_NFS_V3=y
@@ -881,7 +915,6 @@ CONFIG_EXPORTFS=m
881CONFIG_NFS_COMMON=y 915CONFIG_NFS_COMMON=y
882CONFIG_SUNRPC=y 916CONFIG_SUNRPC=y
883CONFIG_SUNRPC_GSS=y 917CONFIG_SUNRPC_GSS=y
884# CONFIG_SUNRPC_REGISTER_V4 is not set
885CONFIG_RPCSEC_GSS_KRB5=y 918CONFIG_RPCSEC_GSS_KRB5=y
886# CONFIG_RPCSEC_GSS_SPKM3 is not set 919# CONFIG_RPCSEC_GSS_SPKM3 is not set
887CONFIG_SMB_FS=m 920CONFIG_SMB_FS=m
@@ -957,11 +990,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
957CONFIG_DEBUG_MEMORY_INIT=y 990CONFIG_DEBUG_MEMORY_INIT=y
958# CONFIG_RCU_CPU_STALL_DETECTOR is not set 991# CONFIG_RCU_CPU_STALL_DETECTOR is not set
959CONFIG_SYSCTL_SYSCALL_CHECK=y 992CONFIG_SYSCTL_SYSCALL_CHECK=y
960
961#
962# Tracers
963#
964# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
965# CONFIG_SAMPLES is not set 993# CONFIG_SAMPLES is not set
966 994
967# 995#
@@ -982,13 +1010,21 @@ CONFIG_CRYPTO=y
982# 1010#
983# CONFIG_CRYPTO_FIPS is not set 1011# CONFIG_CRYPTO_FIPS is not set
984CONFIG_CRYPTO_ALGAPI=y 1012CONFIG_CRYPTO_ALGAPI=y
985CONFIG_CRYPTO_AEAD=y 1013CONFIG_CRYPTO_ALGAPI2=y
1014CONFIG_CRYPTO_AEAD=m
1015CONFIG_CRYPTO_AEAD2=y
986CONFIG_CRYPTO_BLKCIPHER=y 1016CONFIG_CRYPTO_BLKCIPHER=y
1017CONFIG_CRYPTO_BLKCIPHER2=y
987CONFIG_CRYPTO_HASH=y 1018CONFIG_CRYPTO_HASH=y
988CONFIG_CRYPTO_RNG=y 1019CONFIG_CRYPTO_HASH2=y
1020CONFIG_CRYPTO_RNG=m
1021CONFIG_CRYPTO_RNG2=y
1022CONFIG_CRYPTO_PCOMP=y
989CONFIG_CRYPTO_MANAGER=y 1023CONFIG_CRYPTO_MANAGER=y
1024CONFIG_CRYPTO_MANAGER2=y
990CONFIG_CRYPTO_GF128MUL=m 1025CONFIG_CRYPTO_GF128MUL=m
991CONFIG_CRYPTO_NULL=m 1026CONFIG_CRYPTO_NULL=m
1027CONFIG_CRYPTO_WORKQUEUE=y
992CONFIG_CRYPTO_CRYPTD=m 1028CONFIG_CRYPTO_CRYPTD=m
993CONFIG_CRYPTO_AUTHENC=m 1029CONFIG_CRYPTO_AUTHENC=m
994CONFIG_CRYPTO_TEST=m 1030CONFIG_CRYPTO_TEST=m
@@ -1058,6 +1094,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1058# Compression 1094# Compression
1059# 1095#
1060CONFIG_CRYPTO_DEFLATE=m 1096CONFIG_CRYPTO_DEFLATE=m
1097CONFIG_CRYPTO_ZLIB=m
1061CONFIG_CRYPTO_LZO=m 1098CONFIG_CRYPTO_LZO=m
1062 1099
1063# 1100#
@@ -1065,11 +1102,13 @@ CONFIG_CRYPTO_LZO=m
1065# 1102#
1066# CONFIG_CRYPTO_ANSI_CPRNG is not set 1103# CONFIG_CRYPTO_ANSI_CPRNG is not set
1067# CONFIG_CRYPTO_HW is not set 1104# CONFIG_CRYPTO_HW is not set
1105# CONFIG_BINARY_PRINTF is not set
1068 1106
1069# 1107#
1070# Library routines 1108# Library routines
1071# 1109#
1072CONFIG_BITREVERSE=y 1110CONFIG_BITREVERSE=y
1111CONFIG_GENERIC_FIND_LAST_BIT=y
1073CONFIG_CRC_CCITT=m 1112CONFIG_CRC_CCITT=m
1074CONFIG_CRC16=m 1113CONFIG_CRC16=m
1075CONFIG_CRC_T10DIF=y 1114CONFIG_CRC_T10DIF=y
@@ -1081,10 +1120,13 @@ CONFIG_ZLIB_INFLATE=y
1081CONFIG_ZLIB_DEFLATE=m 1120CONFIG_ZLIB_DEFLATE=m
1082CONFIG_LZO_COMPRESS=m 1121CONFIG_LZO_COMPRESS=m
1083CONFIG_LZO_DECOMPRESS=m 1122CONFIG_LZO_DECOMPRESS=m
1123CONFIG_DECOMPRESS_GZIP=y
1124CONFIG_DECOMPRESS_BZIP2=y
1125CONFIG_DECOMPRESS_LZMA=y
1084CONFIG_TEXTSEARCH=y 1126CONFIG_TEXTSEARCH=y
1085CONFIG_TEXTSEARCH_KMP=m 1127CONFIG_TEXTSEARCH_KMP=m
1086CONFIG_TEXTSEARCH_BM=m 1128CONFIG_TEXTSEARCH_BM=m
1087CONFIG_TEXTSEARCH_FSM=m 1129CONFIG_TEXTSEARCH_FSM=m
1088CONFIG_PLIST=y
1089CONFIG_HAS_IOMEM=y 1130CONFIG_HAS_IOMEM=y
1090CONFIG_HAS_DMA=y 1131CONFIG_HAS_DMA=y
1132CONFIG_NLATTR=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 14:46:29 -0500