Commit 6823cfe5531f7507cca5699cda4abd0f65a78bcf
Exists in
master
and in
4 other branches
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pmac: Update PowerMac 32-bit defconfig
Showing 1 changed file Side-by-side Diff
arch/powerpc/configs/pmac32_defconfig
Changes suppressed. Click to show
1 | 1 | # |
2 | 2 | # Automatically generated make config: don't edit |
3 | -# Linux kernel version: 2.6.28-rc3 | |
4 | -# Tue Nov 11 19:36:51 2008 | |
3 | +# Linux kernel version: 2.6.30-rc7 | |
4 | +# Mon May 25 14:53:25 2009 | |
5 | 5 | # |
6 | 6 | # CONFIG_PPC64 is not set |
7 | 7 | |
... | ... | @@ -14,6 +14,7 @@ |
14 | 14 | # CONFIG_40x is not set |
15 | 15 | # CONFIG_44x is not set |
16 | 16 | # CONFIG_E200 is not set |
17 | +CONFIG_PPC_BOOK3S=y | |
17 | 18 | CONFIG_PPC_FPU=y |
18 | 19 | CONFIG_ALTIVEC=y |
19 | 20 | CONFIG_PPC_STD_MMU=y |
... | ... | @@ -43,7 +44,7 @@ |
43 | 44 | CONFIG_PPC=y |
44 | 45 | CONFIG_EARLY_PRINTK=y |
45 | 46 | CONFIG_GENERIC_NVRAM=y |
46 | -CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |
47 | +CONFIG_SCHED_OMIT_FRAME_POINTER=y | |
47 | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | 49 | CONFIG_PPC_OF=y |
49 | 50 | CONFIG_OF=y |
50 | 51 | |
... | ... | @@ -52,12 +53,14 @@ |
52 | 53 | CONFIG_AUDIT_ARCH=y |
53 | 54 | CONFIG_GENERIC_BUG=y |
54 | 55 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
56 | +CONFIG_DTC=y | |
55 | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
56 | 58 | CONFIG_HIBERNATE_32=y |
57 | 59 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y |
58 | 60 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
59 | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
60 | 62 | # CONFIG_PPC_DCR_MMIO is not set |
63 | +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | |
61 | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
62 | 65 | |
63 | 66 | # |
64 | 67 | |
65 | 68 | |
66 | 69 | |
... | ... | @@ -72,14 +75,24 @@ |
72 | 75 | CONFIG_SYSVIPC=y |
73 | 76 | CONFIG_SYSVIPC_SYSCTL=y |
74 | 77 | CONFIG_POSIX_MQUEUE=y |
78 | +CONFIG_POSIX_MQUEUE_SYSCTL=y | |
75 | 79 | # CONFIG_BSD_PROCESS_ACCT is not set |
76 | 80 | # CONFIG_TASKSTATS is not set |
77 | 81 | # CONFIG_AUDIT is not set |
82 | + | |
83 | +# | |
84 | +# RCU Subsystem | |
85 | +# | |
86 | +CONFIG_CLASSIC_RCU=y | |
87 | +# CONFIG_TREE_RCU is not set | |
88 | +# CONFIG_PREEMPT_RCU is not set | |
89 | +# CONFIG_TREE_RCU_TRACE is not set | |
90 | +# CONFIG_PREEMPT_RCU_TRACE is not set | |
78 | 91 | CONFIG_IKCONFIG=y |
79 | 92 | CONFIG_IKCONFIG_PROC=y |
80 | 93 | CONFIG_LOG_BUF_SHIFT=14 |
81 | -# CONFIG_CGROUPS is not set | |
82 | 94 | # CONFIG_GROUP_SCHED is not set |
95 | +# CONFIG_CGROUPS is not set | |
83 | 96 | CONFIG_SYSFS_DEPRECATED=y |
84 | 97 | CONFIG_SYSFS_DEPRECATED_V2=y |
85 | 98 | # CONFIG_RELAY is not set |
86 | 99 | |
87 | 100 | |
88 | 101 | |
89 | 102 | |
90 | 103 | |
... | ... | @@ -88,23 +101,27 @@ |
88 | 101 | # CONFIG_IPC_NS is not set |
89 | 102 | # CONFIG_USER_NS is not set |
90 | 103 | # CONFIG_PID_NS is not set |
104 | +# CONFIG_NET_NS is not set | |
91 | 105 | CONFIG_BLK_DEV_INITRD=y |
92 | 106 | CONFIG_INITRAMFS_SOURCE="" |
107 | +CONFIG_RD_GZIP=y | |
108 | +CONFIG_RD_BZIP2=y | |
109 | +CONFIG_RD_LZMA=y | |
93 | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
94 | 111 | CONFIG_SYSCTL=y |
112 | +CONFIG_ANON_INODES=y | |
95 | 113 | # CONFIG_EMBEDDED is not set |
96 | 114 | CONFIG_SYSCTL_SYSCALL=y |
97 | 115 | CONFIG_KALLSYMS=y |
98 | 116 | CONFIG_KALLSYMS_ALL=y |
99 | 117 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
118 | +# CONFIG_STRIP_ASM_SYMS is not set | |
100 | 119 | CONFIG_HOTPLUG=y |
101 | 120 | CONFIG_PRINTK=y |
102 | 121 | CONFIG_BUG=y |
103 | 122 | CONFIG_ELF_CORE=y |
104 | -# CONFIG_COMPAT_BRK is not set | |
105 | 123 | CONFIG_BASE_FULL=y |
106 | 124 | CONFIG_FUTEX=y |
107 | -CONFIG_ANON_INODES=y | |
108 | 125 | CONFIG_EPOLL=y |
109 | 126 | CONFIG_SIGNALFD=y |
110 | 127 | CONFIG_TIMERFD=y |
111 | 128 | |
... | ... | @@ -114,10 +131,12 @@ |
114 | 131 | CONFIG_VM_EVENT_COUNTERS=y |
115 | 132 | CONFIG_PCI_QUIRKS=y |
116 | 133 | CONFIG_SLUB_DEBUG=y |
134 | +# CONFIG_COMPAT_BRK is not set | |
117 | 135 | # CONFIG_SLAB is not set |
118 | 136 | CONFIG_SLUB=y |
119 | 137 | # CONFIG_SLOB is not set |
120 | 138 | CONFIG_PROFILING=y |
139 | +CONFIG_TRACEPOINTS=y | |
121 | 140 | # CONFIG_MARKERS is not set |
122 | 141 | CONFIG_OPROFILE=y |
123 | 142 | CONFIG_HAVE_OPROFILE=y |
124 | 143 | |
... | ... | @@ -127,10 +146,10 @@ |
127 | 146 | CONFIG_HAVE_KPROBES=y |
128 | 147 | CONFIG_HAVE_KRETPROBES=y |
129 | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | +# CONFIG_SLOW_WORK is not set | |
130 | 150 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
131 | 151 | CONFIG_SLABINFO=y |
132 | 152 | CONFIG_RT_MUTEXES=y |
133 | -# CONFIG_TINY_SHMEM is not set | |
134 | 153 | CONFIG_BASE_SMALL=0 |
135 | 154 | CONFIG_MODULES=y |
136 | 155 | # CONFIG_MODULE_FORCE_LOAD is not set |
137 | 156 | |
... | ... | @@ -138,11 +157,8 @@ |
138 | 157 | CONFIG_MODULE_FORCE_UNLOAD=y |
139 | 158 | # CONFIG_MODVERSIONS is not set |
140 | 159 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
141 | -CONFIG_KMOD=y | |
142 | 160 | CONFIG_BLOCK=y |
143 | 161 | CONFIG_LBD=y |
144 | -# CONFIG_BLK_DEV_IO_TRACE is not set | |
145 | -CONFIG_LSF=y | |
146 | 162 | CONFIG_BLK_DEV_BSG=y |
147 | 163 | # CONFIG_BLK_DEV_INTEGRITY is not set |
148 | 164 | |
149 | 165 | |
... | ... | @@ -158,14 +174,11 @@ |
158 | 174 | # CONFIG_DEFAULT_CFQ is not set |
159 | 175 | # CONFIG_DEFAULT_NOOP is not set |
160 | 176 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
161 | -CONFIG_CLASSIC_RCU=y | |
162 | 177 | CONFIG_FREEZER=y |
163 | 178 | |
164 | 179 | # |
165 | 180 | # Platform support |
166 | 181 | # |
167 | -CONFIG_PPC_MULTIPLATFORM=y | |
168 | -CONFIG_CLASSIC32=y | |
169 | 182 | # CONFIG_PPC_CHRP is not set |
170 | 183 | # CONFIG_MPC5121_ADS is not set |
171 | 184 | # CONFIG_MPC5121_GENERIC is not set |
172 | 185 | |
... | ... | @@ -178,7 +191,9 @@ |
178 | 191 | # CONFIG_PPC_83xx is not set |
179 | 192 | # CONFIG_PPC_86xx is not set |
180 | 193 | # CONFIG_EMBEDDED6xx is not set |
194 | +# CONFIG_AMIGAONE is not set | |
181 | 195 | CONFIG_PPC_NATIVE=y |
196 | +CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | |
182 | 197 | # CONFIG_IPIC is not set |
183 | 198 | CONFIG_MPIC=y |
184 | 199 | # CONFIG_MPIC_WEIRD is not set |
185 | 200 | |
... | ... | @@ -212,11 +227,12 @@ |
212 | 227 | CONFIG_PPC601_SYNC_FIX=y |
213 | 228 | # CONFIG_TAU is not set |
214 | 229 | # CONFIG_FSL_ULI1575 is not set |
230 | +# CONFIG_SIMPLE_GPIO is not set | |
215 | 231 | |
216 | 232 | # |
217 | 233 | # Kernel options |
218 | 234 | # |
219 | -# CONFIG_HIGHMEM is not set | |
235 | +CONFIG_HIGHMEM=y | |
220 | 236 | CONFIG_TICK_ONESHOT=y |
221 | 237 | CONFIG_NO_HZ=y |
222 | 238 | CONFIG_HIGH_RES_TIMERS=y |
... | ... | @@ -239,6 +255,7 @@ |
239 | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
241 | 257 | # CONFIG_KEXEC is not set |
258 | +# CONFIG_CRASH_DUMP is not set | |
242 | 259 | CONFIG_ARCH_FLATMEM_ENABLE=y |
243 | 260 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
244 | 261 | CONFIG_SELECT_MEMORY_MODEL=y |
245 | 262 | |
... | ... | @@ -250,12 +267,17 @@ |
250 | 267 | CONFIG_PAGEFLAGS_EXTENDED=y |
251 | 268 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
252 | 269 | # CONFIG_MIGRATION is not set |
253 | -# CONFIG_RESOURCES_64BIT is not set | |
254 | 270 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
255 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
256 | 272 | CONFIG_BOUNCE=y |
257 | 273 | CONFIG_VIRT_TO_BUS=y |
258 | 274 | CONFIG_UNEVICTABLE_LRU=y |
275 | +CONFIG_HAVE_MLOCK=y | |
276 | +CONFIG_HAVE_MLOCKED_PAGE_BIT=y | |
277 | +CONFIG_PPC_4K_PAGES=y | |
278 | +# CONFIG_PPC_16K_PAGES is not set | |
279 | +# CONFIG_PPC_64K_PAGES is not set | |
280 | +# CONFIG_PPC_256K_PAGES is not set | |
259 | 281 | CONFIG_FORCE_MAX_ZONEORDER=11 |
260 | 282 | CONFIG_PROC_DEVICETREE=y |
261 | 283 | # CONFIG_CMDLINE_BOOL is not set |
... | ... | @@ -288,6 +310,8 @@ |
288 | 310 | # CONFIG_PCI_MSI is not set |
289 | 311 | # CONFIG_PCI_LEGACY is not set |
290 | 312 | # CONFIG_PCI_DEBUG is not set |
313 | +# CONFIG_PCI_STUB is not set | |
314 | +# CONFIG_PCI_IOV is not set | |
291 | 315 | CONFIG_PCCARD=m |
292 | 316 | # CONFIG_PCMCIA_DEBUG is not set |
293 | 317 | CONFIG_PCMCIA=m |
... | ... | @@ -397,6 +421,8 @@ |
397 | 421 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
398 | 422 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set |
399 | 423 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
424 | +CONFIG_NETFILTER_XT_TARGET_HL=m | |
425 | +# CONFIG_NETFILTER_XT_TARGET_LED is not set | |
400 | 426 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
401 | 427 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
402 | 428 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
... | ... | @@ -405,6 +431,7 @@ |
405 | 431 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
406 | 432 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
407 | 433 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
434 | +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set | |
408 | 435 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
409 | 436 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set |
410 | 437 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
... | ... | @@ -415,6 +442,7 @@ |
415 | 442 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
416 | 443 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set |
417 | 444 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
445 | +CONFIG_NETFILTER_XT_MATCH_HL=m | |
418 | 446 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
419 | 447 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
420 | 448 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
421 | 449 | |
422 | 450 | |
423 | 451 | |
... | ... | @@ -478,17 +506,15 @@ |
478 | 506 | CONFIG_IP_NF_ARP_MANGLE=m |
479 | 507 | CONFIG_IP_DCCP=m |
480 | 508 | CONFIG_INET_DCCP_DIAG=m |
481 | -CONFIG_IP_DCCP_ACKVEC=y | |
482 | 509 | |
483 | 510 | # |
484 | 511 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
485 | 512 | # |
486 | -CONFIG_IP_DCCP_CCID2=m | |
487 | 513 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
488 | -CONFIG_IP_DCCP_CCID3=m | |
514 | +CONFIG_IP_DCCP_CCID3=y | |
489 | 515 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set |
490 | 516 | CONFIG_IP_DCCP_CCID3_RTO=100 |
491 | -CONFIG_IP_DCCP_TFRC_LIB=m | |
517 | +CONFIG_IP_DCCP_TFRC_LIB=y | |
492 | 518 | |
493 | 519 | # |
494 | 520 | # DCCP Kernel Hacking |
495 | 521 | |
496 | 522 | |
... | ... | @@ -508,13 +534,16 @@ |
508 | 534 | # CONFIG_LAPB is not set |
509 | 535 | # CONFIG_ECONET is not set |
510 | 536 | # CONFIG_WAN_ROUTER is not set |
537 | +# CONFIG_PHONET is not set | |
511 | 538 | # CONFIG_NET_SCHED is not set |
512 | 539 | CONFIG_NET_CLS_ROUTE=y |
540 | +# CONFIG_DCB is not set | |
513 | 541 | |
514 | 542 | # |
515 | 543 | # Network testing |
516 | 544 | # |
517 | 545 | # CONFIG_NET_PKTGEN is not set |
546 | +# CONFIG_NET_DROP_MONITOR is not set | |
518 | 547 | # CONFIG_HAMRADIO is not set |
519 | 548 | # CONFIG_CAN is not set |
520 | 549 | CONFIG_IRDA=m |
... | ... | @@ -577,8 +606,6 @@ |
577 | 606 | # |
578 | 607 | # Bluetooth device drivers |
579 | 608 | # |
580 | -CONFIG_BT_HCIUSB=m | |
581 | -# CONFIG_BT_HCIUSB_SCO is not set | |
582 | 609 | # CONFIG_BT_HCIBTUSB is not set |
583 | 610 | # CONFIG_BT_HCIUART is not set |
584 | 611 | CONFIG_BT_HCIBCM203X=m |
585 | 612 | |
586 | 613 | |
587 | 614 | |
588 | 615 | |
589 | 616 | |
... | ... | @@ -590,31 +617,27 @@ |
590 | 617 | # CONFIG_BT_HCIBTUART is not set |
591 | 618 | # CONFIG_BT_HCIVHCI is not set |
592 | 619 | # CONFIG_AF_RXRPC is not set |
593 | -# CONFIG_PHONET is not set | |
594 | 620 | CONFIG_WIRELESS=y |
595 | 621 | CONFIG_CFG80211=m |
596 | -CONFIG_NL80211=y | |
622 | +# CONFIG_CFG80211_REG_DEBUG is not set | |
597 | 623 | CONFIG_WIRELESS_OLD_REGULATORY=y |
598 | 624 | CONFIG_WIRELESS_EXT=y |
599 | 625 | CONFIG_WIRELESS_EXT_SYSFS=y |
626 | +# CONFIG_LIB80211 is not set | |
600 | 627 | CONFIG_MAC80211=m |
601 | 628 | |
602 | 629 | # |
603 | 630 | # Rate control algorithm selection |
604 | 631 | # |
605 | -CONFIG_MAC80211_RC_PID=y | |
606 | -# CONFIG_MAC80211_RC_MINSTREL is not set | |
607 | -CONFIG_MAC80211_RC_DEFAULT_PID=y | |
608 | -# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | |
609 | -CONFIG_MAC80211_RC_DEFAULT="pid" | |
632 | +CONFIG_MAC80211_RC_MINSTREL=y | |
633 | +# CONFIG_MAC80211_RC_DEFAULT_PID is not set | |
634 | +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y | |
635 | +CONFIG_MAC80211_RC_DEFAULT="minstrel" | |
610 | 636 | # CONFIG_MAC80211_MESH is not set |
611 | 637 | CONFIG_MAC80211_LEDS=y |
638 | +# CONFIG_MAC80211_DEBUGFS is not set | |
612 | 639 | # CONFIG_MAC80211_DEBUG_MENU is not set |
613 | -CONFIG_IEEE80211=m | |
614 | -# CONFIG_IEEE80211_DEBUG is not set | |
615 | -CONFIG_IEEE80211_CRYPT_WEP=m | |
616 | -CONFIG_IEEE80211_CRYPT_CCMP=m | |
617 | -CONFIG_IEEE80211_CRYPT_TKIP=m | |
640 | +# CONFIG_WIMAX is not set | |
618 | 641 | # CONFIG_RFKILL is not set |
619 | 642 | # CONFIG_NET_9P is not set |
620 | 643 | |
621 | 644 | |
622 | 645 | |
623 | 646 | |
... | ... | @@ -662,17 +685,27 @@ |
662 | 685 | # CONFIG_BLK_DEV_HD is not set |
663 | 686 | CONFIG_MISC_DEVICES=y |
664 | 687 | # CONFIG_PHANTOM is not set |
665 | -# CONFIG_EEPROM_93CX6 is not set | |
666 | 688 | # CONFIG_SGI_IOC4 is not set |
667 | 689 | # CONFIG_TIFM_CORE is not set |
690 | +# CONFIG_ICS932S401 is not set | |
668 | 691 | # CONFIG_ENCLOSURE_SERVICES is not set |
669 | 692 | # CONFIG_HP_ILO is not set |
693 | +# CONFIG_ISL29003 is not set | |
694 | +# CONFIG_C2PORT is not set | |
695 | + | |
696 | +# | |
697 | +# EEPROM support | |
698 | +# | |
699 | +# CONFIG_EEPROM_AT24 is not set | |
700 | +# CONFIG_EEPROM_LEGACY is not set | |
701 | +# CONFIG_EEPROM_93CX6 is not set | |
670 | 702 | CONFIG_HAVE_IDE=y |
671 | 703 | CONFIG_IDE=y |
672 | 704 | |
673 | 705 | # |
674 | 706 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
675 | 707 | # |
708 | +CONFIG_IDE_XFER_MODE=y | |
676 | 709 | CONFIG_IDE_TIMINGS=y |
677 | 710 | CONFIG_IDE_ATAPI=y |
678 | 711 | # CONFIG_BLK_DEV_IDE_SATA is not set |
... | ... | @@ -684,7 +717,6 @@ |
684 | 717 | CONFIG_BLK_DEV_IDECD=y |
685 | 718 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
686 | 719 | # CONFIG_BLK_DEV_IDETAPE is not set |
687 | -CONFIG_BLK_DEV_IDESCSI=y | |
688 | 720 | # CONFIG_IDE_TASK_IOCTL is not set |
689 | 721 | CONFIG_IDE_PROC_FS=y |
690 | 722 | |
... | ... | @@ -714,6 +746,7 @@ |
714 | 746 | # CONFIG_BLK_DEV_JMICRON is not set |
715 | 747 | # CONFIG_BLK_DEV_SC1200 is not set |
716 | 748 | # CONFIG_BLK_DEV_PIIX is not set |
749 | +# CONFIG_BLK_DEV_IT8172 is not set | |
717 | 750 | # CONFIG_BLK_DEV_IT8213 is not set |
718 | 751 | # CONFIG_BLK_DEV_IT821X is not set |
719 | 752 | # CONFIG_BLK_DEV_NS87415 is not set |
... | ... | @@ -728,7 +761,6 @@ |
728 | 761 | # CONFIG_BLK_DEV_TC86C001 is not set |
729 | 762 | CONFIG_BLK_DEV_IDE_PMAC=y |
730 | 763 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
731 | -CONFIG_BLK_DEV_IDEDMA_PMAC=y | |
732 | 764 | CONFIG_BLK_DEV_IDEDMA=y |
733 | 765 | |
734 | 766 | # |
... | ... | @@ -772,6 +804,7 @@ |
772 | 804 | # CONFIG_SCSI_SRP_ATTRS is not set |
773 | 805 | CONFIG_SCSI_LOWLEVEL=y |
774 | 806 | # CONFIG_ISCSI_TCP is not set |
807 | +# CONFIG_SCSI_CXGB3_ISCSI is not set | |
775 | 808 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
776 | 809 | # CONFIG_SCSI_3W_9XXX is not set |
777 | 810 | # CONFIG_SCSI_ACARD is not set |
778 | 811 | |
... | ... | @@ -791,8 +824,12 @@ |
791 | 824 | # CONFIG_MEGARAID_NEWGEN is not set |
792 | 825 | # CONFIG_MEGARAID_LEGACY is not set |
793 | 826 | # CONFIG_MEGARAID_SAS is not set |
827 | +# CONFIG_SCSI_MPT2SAS is not set | |
794 | 828 | # CONFIG_SCSI_HPTIOP is not set |
795 | 829 | # CONFIG_SCSI_BUSLOGIC is not set |
830 | +# CONFIG_LIBFC is not set | |
831 | +# CONFIG_LIBFCOE is not set | |
832 | +# CONFIG_FCOE is not set | |
796 | 833 | # CONFIG_SCSI_DMX3191D is not set |
797 | 834 | # CONFIG_SCSI_EATA is not set |
798 | 835 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
... | ... | @@ -822,6 +859,7 @@ |
822 | 859 | # CONFIG_SCSI_SRP is not set |
823 | 860 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
824 | 861 | # CONFIG_SCSI_DH is not set |
862 | +# CONFIG_SCSI_OSD_INITIATOR is not set | |
825 | 863 | # CONFIG_ATA is not set |
826 | 864 | CONFIG_MD=y |
827 | 865 | CONFIG_BLK_DEV_MD=m |
... | ... | @@ -881,6 +919,7 @@ |
881 | 919 | # CONFIG_ANSLCD is not set |
882 | 920 | CONFIG_PMAC_RACKMETER=m |
883 | 921 | CONFIG_NETDEVICES=y |
922 | +CONFIG_COMPAT_NET_DEV_OPS=y | |
884 | 923 | CONFIG_DUMMY=m |
885 | 924 | # CONFIG_BONDING is not set |
886 | 925 | # CONFIG_MACVLAN is not set |
... | ... | @@ -898,6 +937,8 @@ |
898 | 937 | CONFIG_SUNGEM=y |
899 | 938 | # CONFIG_CASSINI is not set |
900 | 939 | # CONFIG_NET_VENDOR_3COM is not set |
940 | +# CONFIG_ETHOC is not set | |
941 | +# CONFIG_DNET is not set | |
901 | 942 | # CONFIG_NET_TULIP is not set |
902 | 943 | # CONFIG_HP100 is not set |
903 | 944 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
... | ... | @@ -913,7 +954,6 @@ |
913 | 954 | # CONFIG_ADAPTEC_STARFIRE is not set |
914 | 955 | # CONFIG_B44 is not set |
915 | 956 | # CONFIG_FORCEDETH is not set |
916 | -# CONFIG_EEPRO100 is not set | |
917 | 957 | # CONFIG_E100 is not set |
918 | 958 | # CONFIG_FEALNX is not set |
919 | 959 | # CONFIG_NATSEMI is not set |
... | ... | @@ -923,6 +963,7 @@ |
923 | 963 | # CONFIG_R6040 is not set |
924 | 964 | # CONFIG_SIS900 is not set |
925 | 965 | # CONFIG_EPIC100 is not set |
966 | +# CONFIG_SMSC9420 is not set | |
926 | 967 | # CONFIG_SUNDANCE is not set |
927 | 968 | # CONFIG_TLAN is not set |
928 | 969 | # CONFIG_VIA_RHINE is not set |
... | ... | @@ -935,6 +976,7 @@ |
935 | 976 | # CONFIG_E1000E is not set |
936 | 977 | # CONFIG_IP1000 is not set |
937 | 978 | # CONFIG_IGB is not set |
979 | +# CONFIG_IGBVF is not set | |
938 | 980 | # CONFIG_NS83820 is not set |
939 | 981 | # CONFIG_HAMACHI is not set |
940 | 982 | # CONFIG_YELLOWFIN is not set |
941 | 983 | |
942 | 984 | |
943 | 985 | |
... | ... | @@ -945,18 +987,20 @@ |
945 | 987 | # CONFIG_VIA_VELOCITY is not set |
946 | 988 | # CONFIG_TIGON3 is not set |
947 | 989 | # CONFIG_BNX2 is not set |
948 | -# CONFIG_MV643XX_ETH is not set | |
949 | 990 | # CONFIG_QLA3XXX is not set |
950 | 991 | # CONFIG_ATL1 is not set |
951 | 992 | # CONFIG_ATL1E is not set |
993 | +# CONFIG_ATL1C is not set | |
952 | 994 | # CONFIG_JME is not set |
953 | 995 | CONFIG_NETDEV_10000=y |
954 | 996 | # CONFIG_CHELSIO_T1 is not set |
997 | +CONFIG_CHELSIO_T3_DEPENDS=y | |
955 | 998 | # CONFIG_CHELSIO_T3 is not set |
956 | 999 | # CONFIG_ENIC is not set |
957 | 1000 | # CONFIG_IXGBE is not set |
958 | 1001 | # CONFIG_IXGB is not set |
959 | 1002 | # CONFIG_S2IO is not set |
1003 | +# CONFIG_VXGE is not set | |
960 | 1004 | # CONFIG_MYRI10GE is not set |
961 | 1005 | # CONFIG_NETXEN_NIC is not set |
962 | 1006 | # CONFIG_NIU is not set |
... | ... | @@ -966,6 +1010,7 @@ |
966 | 1010 | # CONFIG_BNX2X is not set |
967 | 1011 | # CONFIG_QLGE is not set |
968 | 1012 | # CONFIG_SFC is not set |
1013 | +# CONFIG_BE2NET is not set | |
969 | 1014 | # CONFIG_TR is not set |
970 | 1015 | |
971 | 1016 | # |
972 | 1017 | |
973 | 1018 | |
... | ... | @@ -974,20 +1019,11 @@ |
974 | 1019 | # CONFIG_WLAN_PRE80211 is not set |
975 | 1020 | CONFIG_WLAN_80211=y |
976 | 1021 | # CONFIG_PCMCIA_RAYCS is not set |
977 | -# CONFIG_IPW2100 is not set | |
978 | -# CONFIG_IPW2200 is not set | |
979 | 1022 | # CONFIG_LIBERTAS is not set |
980 | 1023 | # CONFIG_LIBERTAS_THINFIRM is not set |
981 | 1024 | # CONFIG_AIRO is not set |
982 | -CONFIG_HERMES=m | |
983 | -CONFIG_APPLE_AIRPORT=m | |
984 | -# CONFIG_PLX_HERMES is not set | |
985 | -# CONFIG_TMD_HERMES is not set | |
986 | -# CONFIG_NORTEL_HERMES is not set | |
987 | -CONFIG_PCI_HERMES=m | |
988 | -CONFIG_PCMCIA_HERMES=m | |
989 | -# CONFIG_PCMCIA_SPECTRUM is not set | |
990 | 1025 | # CONFIG_ATMEL is not set |
1026 | +# CONFIG_AT76C50X_USB is not set | |
991 | 1027 | # CONFIG_AIRO_CS is not set |
992 | 1028 | # CONFIG_PCMCIA_WL3501 is not set |
993 | 1029 | CONFIG_PRISM54=m |
994 | 1030 | |
995 | 1031 | |
... | ... | @@ -997,15 +1033,17 @@ |
997 | 1033 | # CONFIG_RTL8187 is not set |
998 | 1034 | # CONFIG_ADM8211 is not set |
999 | 1035 | # CONFIG_MAC80211_HWSIM is not set |
1036 | +# CONFIG_MWL8K is not set | |
1000 | 1037 | CONFIG_P54_COMMON=m |
1001 | 1038 | # CONFIG_P54_USB is not set |
1002 | 1039 | # CONFIG_P54_PCI is not set |
1040 | +CONFIG_P54_LEDS=y | |
1003 | 1041 | # CONFIG_ATH5K is not set |
1004 | 1042 | # CONFIG_ATH9K is not set |
1005 | -# CONFIG_IWLCORE is not set | |
1006 | -# CONFIG_IWLWIFI_LEDS is not set | |
1007 | -# CONFIG_IWLAGN is not set | |
1008 | -# CONFIG_IWL3945 is not set | |
1043 | +# CONFIG_AR9170_USB is not set | |
1044 | +# CONFIG_IPW2100 is not set | |
1045 | +# CONFIG_IPW2200 is not set | |
1046 | +# CONFIG_IWLWIFI is not set | |
1009 | 1047 | # CONFIG_HOSTAP is not set |
1010 | 1048 | CONFIG_B43=m |
1011 | 1049 | CONFIG_B43_PCI_AUTOSELECT=y |
1012 | 1050 | |
... | ... | @@ -1025,8 +1063,21 @@ |
1025 | 1063 | # CONFIG_B43LEGACY_PIO_MODE is not set |
1026 | 1064 | # CONFIG_ZD1211RW is not set |
1027 | 1065 | # CONFIG_RT2X00 is not set |
1066 | +CONFIG_HERMES=m | |
1067 | +CONFIG_HERMES_CACHE_FW_ON_INIT=y | |
1068 | +CONFIG_APPLE_AIRPORT=m | |
1069 | +# CONFIG_PLX_HERMES is not set | |
1070 | +# CONFIG_TMD_HERMES is not set | |
1071 | +# CONFIG_NORTEL_HERMES is not set | |
1072 | +CONFIG_PCI_HERMES=m | |
1073 | +CONFIG_PCMCIA_HERMES=m | |
1074 | +# CONFIG_PCMCIA_SPECTRUM is not set | |
1028 | 1075 | |
1029 | 1076 | # |
1077 | +# Enable WiMAX (Networking options) to see the WiMAX drivers | |
1078 | +# | |
1079 | + | |
1080 | +# | |
1030 | 1081 | # USB Network Adapters |
1031 | 1082 | # |
1032 | 1083 | # CONFIG_USB_CATC is not set |
... | ... | @@ -1036,6 +1087,7 @@ |
1036 | 1087 | CONFIG_USB_USBNET=m |
1037 | 1088 | CONFIG_USB_NET_AX8817X=m |
1038 | 1089 | CONFIG_USB_NET_CDCETHER=m |
1090 | +# CONFIG_USB_NET_CDC_EEM is not set | |
1039 | 1091 | # CONFIG_USB_NET_DM9601 is not set |
1040 | 1092 | # CONFIG_USB_NET_SMSC95XX is not set |
1041 | 1093 | # CONFIG_USB_NET_GL620A is not set |
... | ... | @@ -1099,7 +1151,7 @@ |
1099 | 1151 | CONFIG_INPUT_MOUSE=y |
1100 | 1152 | # CONFIG_MOUSE_PS2 is not set |
1101 | 1153 | # CONFIG_MOUSE_SERIAL is not set |
1102 | -# CONFIG_MOUSE_APPLETOUCH is not set | |
1154 | +CONFIG_MOUSE_APPLETOUCH=y | |
1103 | 1155 | # CONFIG_MOUSE_BCM5974 is not set |
1104 | 1156 | # CONFIG_MOUSE_VSXXXAA is not set |
1105 | 1157 | # CONFIG_INPUT_JOYSTICK is not set |
1106 | 1158 | |
1107 | 1159 | |
... | ... | @@ -1150,10 +1202,13 @@ |
1150 | 1202 | # CONFIG_SERIAL_JSM is not set |
1151 | 1203 | # CONFIG_SERIAL_OF_PLATFORM is not set |
1152 | 1204 | CONFIG_UNIX98_PTYS=y |
1205 | +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | |
1153 | 1206 | CONFIG_LEGACY_PTYS=y |
1154 | 1207 | CONFIG_LEGACY_PTY_COUNT=256 |
1208 | +# CONFIG_HVC_UDBG is not set | |
1155 | 1209 | # CONFIG_IPMI_HANDLER is not set |
1156 | 1210 | CONFIG_HW_RANDOM=m |
1211 | +# CONFIG_HW_RANDOM_TIMERIOMEM is not set | |
1157 | 1212 | CONFIG_NVRAM=y |
1158 | 1213 | CONFIG_GEN_RTC=y |
1159 | 1214 | # CONFIG_GEN_RTC_X is not set |
1160 | 1215 | |
... | ... | @@ -1232,12 +1287,9 @@ |
1232 | 1287 | # Miscellaneous I2C Chip support |
1233 | 1288 | # |
1234 | 1289 | # CONFIG_DS1682 is not set |
1235 | -# CONFIG_EEPROM_AT24 is not set | |
1236 | -# CONFIG_EEPROM_LEGACY is not set | |
1237 | 1290 | # CONFIG_SENSORS_PCF8574 is not set |
1238 | 1291 | # CONFIG_PCF8575 is not set |
1239 | 1292 | # CONFIG_SENSORS_PCA9539 is not set |
1240 | -# CONFIG_SENSORS_PCF8591 is not set | |
1241 | 1293 | # CONFIG_SENSORS_MAX6875 is not set |
1242 | 1294 | # CONFIG_SENSORS_TSL2550 is not set |
1243 | 1295 | # CONFIG_I2C_DEBUG_CORE is not set |
1244 | 1296 | |
... | ... | @@ -1259,11 +1311,11 @@ |
1259 | 1311 | # CONFIG_THERMAL is not set |
1260 | 1312 | # CONFIG_THERMAL_HWMON is not set |
1261 | 1313 | # CONFIG_WATCHDOG is not set |
1314 | +CONFIG_SSB_POSSIBLE=y | |
1262 | 1315 | |
1263 | 1316 | # |
1264 | 1317 | # Sonics Silicon Backplane |
1265 | 1318 | # |
1266 | -CONFIG_SSB_POSSIBLE=y | |
1267 | 1319 | CONFIG_SSB=m |
1268 | 1320 | CONFIG_SSB_SPROM=y |
1269 | 1321 | CONFIG_SSB_PCIHOST_POSSIBLE=y |
1270 | 1322 | |
1271 | 1323 | |
... | ... | @@ -1281,18 +1333,13 @@ |
1281 | 1333 | # CONFIG_MFD_CORE is not set |
1282 | 1334 | # CONFIG_MFD_SM501 is not set |
1283 | 1335 | # CONFIG_HTC_PASIC3 is not set |
1336 | +# CONFIG_TWL4030_CORE is not set | |
1284 | 1337 | # CONFIG_MFD_TMIO is not set |
1285 | 1338 | # CONFIG_PMIC_DA903X is not set |
1286 | 1339 | # CONFIG_MFD_WM8400 is not set |
1287 | 1340 | # CONFIG_MFD_WM8350_I2C is not set |
1288 | - | |
1289 | -# | |
1290 | -# Voltage and Current regulators | |
1291 | -# | |
1341 | +# CONFIG_MFD_PCF50633 is not set | |
1292 | 1342 | # CONFIG_REGULATOR is not set |
1293 | -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set | |
1294 | -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | |
1295 | -# CONFIG_REGULATOR_BQ24022 is not set | |
1296 | 1343 | |
1297 | 1344 | # |
1298 | 1345 | # Multimedia devices |
... | ... | @@ -1390,6 +1437,7 @@ |
1390 | 1437 | # CONFIG_FB_KYRO is not set |
1391 | 1438 | CONFIG_FB_3DFX=y |
1392 | 1439 | # CONFIG_FB_3DFX_ACCEL is not set |
1440 | +CONFIG_FB_3DFX_I2C=y | |
1393 | 1441 | # CONFIG_FB_VOODOO1 is not set |
1394 | 1442 | # CONFIG_FB_VT8623 is not set |
1395 | 1443 | # CONFIG_FB_TRIDENT is not set |
1396 | 1444 | |
... | ... | @@ -1399,12 +1447,14 @@ |
1399 | 1447 | # CONFIG_FB_IBM_GXT4500 is not set |
1400 | 1448 | # CONFIG_FB_VIRTUAL is not set |
1401 | 1449 | # CONFIG_FB_METRONOME is not set |
1450 | +# CONFIG_FB_MB862XX is not set | |
1451 | +# CONFIG_FB_BROADSHEET is not set | |
1402 | 1452 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1403 | 1453 | CONFIG_LCD_CLASS_DEVICE=m |
1404 | 1454 | # CONFIG_LCD_ILI9320 is not set |
1405 | 1455 | # CONFIG_LCD_PLATFORM is not set |
1406 | 1456 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1407 | -# CONFIG_BACKLIGHT_CORGI is not set | |
1457 | +CONFIG_BACKLIGHT_GENERIC=y | |
1408 | 1458 | |
1409 | 1459 | # |
1410 | 1460 | # Display device support |
1411 | 1461 | |
... | ... | @@ -1444,11 +1494,13 @@ |
1444 | 1494 | CONFIG_SND_PCM_OSS=m |
1445 | 1495 | CONFIG_SND_PCM_OSS_PLUGINS=y |
1446 | 1496 | CONFIG_SND_SEQUENCER_OSS=y |
1497 | +# CONFIG_SND_HRTIMER is not set | |
1447 | 1498 | # CONFIG_SND_DYNAMIC_MINORS is not set |
1448 | 1499 | CONFIG_SND_SUPPORT_OLD_API=y |
1449 | 1500 | CONFIG_SND_VERBOSE_PROCFS=y |
1450 | 1501 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1451 | 1502 | # CONFIG_SND_DEBUG is not set |
1503 | +CONFIG_SND_VMASTER=y | |
1452 | 1504 | CONFIG_SND_DRIVERS=y |
1453 | 1505 | CONFIG_SND_DUMMY=m |
1454 | 1506 | # CONFIG_SND_VIRMIDI is not set |
... | ... | @@ -1486,6 +1538,8 @@ |
1486 | 1538 | # CONFIG_SND_INDIGO is not set |
1487 | 1539 | # CONFIG_SND_INDIGOIO is not set |
1488 | 1540 | # CONFIG_SND_INDIGODJ is not set |
1541 | +# CONFIG_SND_INDIGOIOX is not set | |
1542 | +# CONFIG_SND_INDIGODJX is not set | |
1489 | 1543 | # CONFIG_SND_EMU10K1 is not set |
1490 | 1544 | # CONFIG_SND_EMU10K1X is not set |
1491 | 1545 | # CONFIG_SND_ENS1370 is not set |
1492 | 1546 | |
1493 | 1547 | |
1494 | 1548 | |
1495 | 1549 | |
1496 | 1550 | |
1497 | 1551 | |
... | ... | @@ -1551,28 +1605,31 @@ |
1551 | 1605 | # |
1552 | 1606 | # Special HID drivers |
1553 | 1607 | # |
1554 | -CONFIG_HID_COMPAT=y | |
1555 | 1608 | CONFIG_HID_A4TECH=y |
1556 | 1609 | CONFIG_HID_APPLE=y |
1557 | 1610 | CONFIG_HID_BELKIN=y |
1558 | -CONFIG_HID_BRIGHT=y | |
1559 | 1611 | CONFIG_HID_CHERRY=y |
1560 | 1612 | CONFIG_HID_CHICONY=y |
1561 | 1613 | CONFIG_HID_CYPRESS=y |
1562 | -CONFIG_HID_DELL=y | |
1614 | +# CONFIG_DRAGONRISE_FF is not set | |
1563 | 1615 | CONFIG_HID_EZKEY=y |
1616 | +CONFIG_HID_KYE=y | |
1564 | 1617 | CONFIG_HID_GYRATION=y |
1618 | +CONFIG_HID_KENSINGTON=y | |
1565 | 1619 | CONFIG_HID_LOGITECH=y |
1566 | 1620 | # CONFIG_LOGITECH_FF is not set |
1567 | 1621 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
1568 | 1622 | CONFIG_HID_MICROSOFT=y |
1569 | 1623 | CONFIG_HID_MONTEREY=y |
1624 | +CONFIG_HID_NTRIG=y | |
1570 | 1625 | CONFIG_HID_PANTHERLORD=y |
1571 | 1626 | # CONFIG_PANTHERLORD_FF is not set |
1572 | 1627 | CONFIG_HID_PETALYNX=y |
1573 | 1628 | CONFIG_HID_SAMSUNG=y |
1574 | 1629 | CONFIG_HID_SONY=y |
1575 | 1630 | CONFIG_HID_SUNPLUS=y |
1631 | +# CONFIG_GREENASIA_FF is not set | |
1632 | +CONFIG_HID_TOPSEED=y | |
1576 | 1633 | # CONFIG_THRUSTMASTER_FF is not set |
1577 | 1634 | # CONFIG_ZEROPLUS_FF is not set |
1578 | 1635 | CONFIG_USB_SUPPORT=y |
... | ... | @@ -1603,6 +1660,7 @@ |
1603 | 1660 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1604 | 1661 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1605 | 1662 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1663 | +# CONFIG_USB_OXU210HP_HCD is not set | |
1606 | 1664 | # CONFIG_USB_ISP116X_HCD is not set |
1607 | 1665 | # CONFIG_USB_ISP1760_HCD is not set |
1608 | 1666 | CONFIG_USB_OHCI_HCD=y |
1609 | 1667 | |
1610 | 1668 | |
1611 | 1669 | |
... | ... | @@ -1625,24 +1683,23 @@ |
1625 | 1683 | # CONFIG_USB_TMC is not set |
1626 | 1684 | |
1627 | 1685 | # |
1628 | -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | |
1686 | +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may | |
1629 | 1687 | # |
1630 | 1688 | |
1631 | 1689 | # |
1632 | -# may also be needed; see USB_STORAGE Help for more information | |
1690 | +# also be needed; see USB_STORAGE Help for more info | |
1633 | 1691 | # |
1634 | 1692 | CONFIG_USB_STORAGE=m |
1635 | 1693 | # CONFIG_USB_STORAGE_DEBUG is not set |
1636 | 1694 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1637 | 1695 | # CONFIG_USB_STORAGE_FREECOM is not set |
1638 | 1696 | # CONFIG_USB_STORAGE_ISD200 is not set |
1639 | -# CONFIG_USB_STORAGE_DPCM is not set | |
1640 | 1697 | # CONFIG_USB_STORAGE_USBAT is not set |
1641 | 1698 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1642 | 1699 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1643 | 1700 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1644 | 1701 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1645 | -CONFIG_USB_STORAGE_ONETOUCH=y | |
1702 | +CONFIG_USB_STORAGE_ONETOUCH=m | |
1646 | 1703 | # CONFIG_USB_STORAGE_KARMA is not set |
1647 | 1704 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1648 | 1705 | # CONFIG_USB_LIBUSUAL is not set |
... | ... | @@ -1665,7 +1722,7 @@ |
1665 | 1722 | # CONFIG_USB_SERIAL_CH341 is not set |
1666 | 1723 | # CONFIG_USB_SERIAL_WHITEHEAT is not set |
1667 | 1724 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set |
1668 | -# CONFIG_USB_SERIAL_CP2101 is not set | |
1725 | +# CONFIG_USB_SERIAL_CP210X is not set | |
1669 | 1726 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set |
1670 | 1727 | # CONFIG_USB_SERIAL_EMPEG is not set |
1671 | 1728 | # CONFIG_USB_SERIAL_FTDI_SIO is not set |
1672 | 1729 | |
1673 | 1730 | |
1674 | 1731 | |
... | ... | @@ -1701,15 +1758,19 @@ |
1701 | 1758 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1702 | 1759 | # CONFIG_USB_SERIAL_PL2303 is not set |
1703 | 1760 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1761 | +# CONFIG_USB_SERIAL_QUALCOMM is not set | |
1704 | 1762 | # CONFIG_USB_SERIAL_SPCP8X5 is not set |
1705 | 1763 | # CONFIG_USB_SERIAL_HP4X is not set |
1706 | 1764 | # CONFIG_USB_SERIAL_SAFE is not set |
1765 | +# CONFIG_USB_SERIAL_SIEMENS_MPI is not set | |
1707 | 1766 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
1767 | +# CONFIG_USB_SERIAL_SYMBOL is not set | |
1708 | 1768 | # CONFIG_USB_SERIAL_TI is not set |
1709 | 1769 | # CONFIG_USB_SERIAL_CYBERJACK is not set |
1710 | 1770 | # CONFIG_USB_SERIAL_XIRCOM is not set |
1711 | 1771 | # CONFIG_USB_SERIAL_OPTION is not set |
1712 | 1772 | # CONFIG_USB_SERIAL_OMNINET is not set |
1773 | +# CONFIG_USB_SERIAL_OPTICON is not set | |
1713 | 1774 | # CONFIG_USB_SERIAL_DEBUG is not set |
1714 | 1775 | |
1715 | 1776 | # |
... | ... | @@ -1726,7 +1787,6 @@ |
1726 | 1787 | # CONFIG_USB_LED is not set |
1727 | 1788 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
1728 | 1789 | # CONFIG_USB_CYTHERM is not set |
1729 | -# CONFIG_USB_PHIDGET is not set | |
1730 | 1790 | # CONFIG_USB_IDMOUSE is not set |
1731 | 1791 | # CONFIG_USB_FTDI_ELAN is not set |
1732 | 1792 | CONFIG_USB_APPLEDISPLAY=m |
... | ... | @@ -1738,6 +1798,11 @@ |
1738 | 1798 | # CONFIG_USB_ISIGHTFW is not set |
1739 | 1799 | # CONFIG_USB_VST is not set |
1740 | 1800 | # CONFIG_USB_GADGET is not set |
1801 | + | |
1802 | +# | |
1803 | +# OTG and related infrastructure | |
1804 | +# | |
1805 | +# CONFIG_NOP_USB_XCEIV is not set | |
1741 | 1806 | # CONFIG_UWB is not set |
1742 | 1807 | # CONFIG_MMC is not set |
1743 | 1808 | # CONFIG_MEMSTICK is not set |
1744 | 1809 | |
... | ... | @@ -1748,7 +1813,9 @@ |
1748 | 1813 | # LED drivers |
1749 | 1814 | # |
1750 | 1815 | # CONFIG_LEDS_PCA9532 is not set |
1816 | +# CONFIG_LEDS_LP5521 is not set | |
1751 | 1817 | # CONFIG_LEDS_PCA955X is not set |
1818 | +# CONFIG_LEDS_BD2802 is not set | |
1752 | 1819 | |
1753 | 1820 | # |
1754 | 1821 | # LED Triggers |
1755 | 1822 | |
... | ... | @@ -1759,11 +1826,16 @@ |
1759 | 1826 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
1760 | 1827 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set |
1761 | 1828 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y |
1829 | + | |
1830 | +# | |
1831 | +# iptables trigger is under Netfilter config (LED target) | |
1832 | +# | |
1762 | 1833 | # CONFIG_ACCESSIBILITY is not set |
1763 | 1834 | # CONFIG_INFINIBAND is not set |
1764 | 1835 | # CONFIG_EDAC is not set |
1765 | 1836 | # CONFIG_RTC_CLASS is not set |
1766 | 1837 | # CONFIG_DMADEVICES is not set |
1838 | +# CONFIG_AUXDISPLAY is not set | |
1767 | 1839 | # CONFIG_UIO is not set |
1768 | 1840 | # CONFIG_STAGING is not set |
1769 | 1841 | |
... | ... | @@ -1774,6 +1846,7 @@ |
1774 | 1846 | # CONFIG_EXT2_FS_XATTR is not set |
1775 | 1847 | # CONFIG_EXT2_FS_XIP is not set |
1776 | 1848 | CONFIG_EXT3_FS=y |
1849 | +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | |
1777 | 1850 | CONFIG_EXT3_FS_XATTR=y |
1778 | 1851 | CONFIG_EXT3_FS_POSIX_ACL=y |
1779 | 1852 | # CONFIG_EXT3_FS_SECURITY is not set |
1780 | 1853 | |
... | ... | @@ -1783,7 +1856,9 @@ |
1783 | 1856 | # CONFIG_EXT4_FS_POSIX_ACL is not set |
1784 | 1857 | # CONFIG_EXT4_FS_SECURITY is not set |
1785 | 1858 | CONFIG_JBD=y |
1859 | +# CONFIG_JBD_DEBUG is not set | |
1786 | 1860 | CONFIG_JBD2=y |
1861 | +# CONFIG_JBD2_DEBUG is not set | |
1787 | 1862 | CONFIG_FS_MBCACHE=y |
1788 | 1863 | # CONFIG_REISERFS_FS is not set |
1789 | 1864 | # CONFIG_JFS_FS is not set |
... | ... | @@ -1792,6 +1867,7 @@ |
1792 | 1867 | # CONFIG_XFS_FS is not set |
1793 | 1868 | # CONFIG_GFS2_FS is not set |
1794 | 1869 | # CONFIG_OCFS2_FS is not set |
1870 | +# CONFIG_BTRFS_FS is not set | |
1795 | 1871 | CONFIG_DNOTIFY=y |
1796 | 1872 | CONFIG_INOTIFY=y |
1797 | 1873 | CONFIG_INOTIFY_USER=y |
... | ... | @@ -1801,6 +1877,11 @@ |
1801 | 1877 | CONFIG_FUSE_FS=m |
1802 | 1878 | |
1803 | 1879 | # |
1880 | +# Caches | |
1881 | +# | |
1882 | +# CONFIG_FSCACHE is not set | |
1883 | + | |
1884 | +# | |
1804 | 1885 | # CD-ROM/DVD Filesystems |
1805 | 1886 | # |
1806 | 1887 | CONFIG_ISO9660_FS=y |
... | ... | @@ -1831,10 +1912,7 @@ |
1831 | 1912 | # CONFIG_TMPFS_POSIX_ACL is not set |
1832 | 1913 | # CONFIG_HUGETLB_PAGE is not set |
1833 | 1914 | # CONFIG_CONFIGFS_FS is not set |
1834 | - | |
1835 | -# | |
1836 | -# Miscellaneous filesystems | |
1837 | -# | |
1915 | +CONFIG_MISC_FILESYSTEMS=y | |
1838 | 1916 | # CONFIG_ADFS_FS is not set |
1839 | 1917 | # CONFIG_AFFS_FS is not set |
1840 | 1918 | CONFIG_HFS_FS=m |
... | ... | @@ -1843,6 +1921,7 @@ |
1843 | 1921 | # CONFIG_BFS_FS is not set |
1844 | 1922 | # CONFIG_EFS_FS is not set |
1845 | 1923 | # CONFIG_CRAMFS is not set |
1924 | +# CONFIG_SQUASHFS is not set | |
1846 | 1925 | # CONFIG_VXFS_FS is not set |
1847 | 1926 | # CONFIG_MINIX_FS is not set |
1848 | 1927 | # CONFIG_OMFS_FS is not set |
... | ... | @@ -1851,6 +1930,7 @@ |
1851 | 1930 | # CONFIG_ROMFS_FS is not set |
1852 | 1931 | # CONFIG_SYSV_FS is not set |
1853 | 1932 | # CONFIG_UFS_FS is not set |
1933 | +# CONFIG_NILFS2_FS is not set | |
1854 | 1934 | CONFIG_NETWORK_FILESYSTEMS=y |
1855 | 1935 | CONFIG_NFS_FS=y |
1856 | 1936 | CONFIG_NFS_V3=y |
... | ... | @@ -1868,7 +1948,6 @@ |
1868 | 1948 | CONFIG_NFS_COMMON=y |
1869 | 1949 | CONFIG_SUNRPC=y |
1870 | 1950 | CONFIG_SUNRPC_GSS=y |
1871 | -# CONFIG_SUNRPC_REGISTER_V4 is not set | |
1872 | 1951 | CONFIG_RPCSEC_GSS_KRB5=y |
1873 | 1952 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1874 | 1953 | CONFIG_SMB_FS=m |
1875 | 1954 | |
... | ... | @@ -1940,11 +2019,13 @@ |
1940 | 2019 | # CONFIG_NLS_KOI8_U is not set |
1941 | 2020 | CONFIG_NLS_UTF8=m |
1942 | 2021 | # CONFIG_DLM is not set |
2022 | +CONFIG_BINARY_PRINTF=y | |
1943 | 2023 | |
1944 | 2024 | # |
1945 | 2025 | # Library routines |
1946 | 2026 | # |
1947 | 2027 | CONFIG_BITREVERSE=y |
2028 | +CONFIG_GENERIC_FIND_LAST_BIT=y | |
1948 | 2029 | CONFIG_CRC_CCITT=y |
1949 | 2030 | CONFIG_CRC16=y |
1950 | 2031 | CONFIG_CRC_T10DIF=y |
1951 | 2032 | |
1952 | 2033 | |
... | ... | @@ -1954,15 +2035,18 @@ |
1954 | 2035 | CONFIG_LIBCRC32C=m |
1955 | 2036 | CONFIG_ZLIB_INFLATE=y |
1956 | 2037 | CONFIG_ZLIB_DEFLATE=y |
2038 | +CONFIG_DECOMPRESS_GZIP=y | |
2039 | +CONFIG_DECOMPRESS_BZIP2=y | |
2040 | +CONFIG_DECOMPRESS_LZMA=y | |
1957 | 2041 | CONFIG_TEXTSEARCH=y |
1958 | 2042 | CONFIG_TEXTSEARCH_KMP=m |
1959 | 2043 | CONFIG_TEXTSEARCH_BM=m |
1960 | 2044 | CONFIG_TEXTSEARCH_FSM=m |
1961 | -CONFIG_PLIST=y | |
1962 | 2045 | CONFIG_HAS_IOMEM=y |
1963 | 2046 | CONFIG_HAS_IOPORT=y |
1964 | 2047 | CONFIG_HAS_DMA=y |
1965 | 2048 | CONFIG_HAVE_LMB=y |
2049 | +CONFIG_NLATTR=y | |
1966 | 2050 | |
1967 | 2051 | # |
1968 | 2052 | # Kernel hacking |
1969 | 2053 | |
... | ... | @@ -1973,13 +2057,16 @@ |
1973 | 2057 | CONFIG_FRAME_WARN=1024 |
1974 | 2058 | CONFIG_MAGIC_SYSRQ=y |
1975 | 2059 | # CONFIG_UNUSED_SYMBOLS is not set |
1976 | -# CONFIG_DEBUG_FS is not set | |
2060 | +CONFIG_DEBUG_FS=y | |
1977 | 2061 | # CONFIG_HEADERS_CHECK is not set |
1978 | 2062 | CONFIG_DEBUG_KERNEL=y |
1979 | 2063 | # CONFIG_DEBUG_SHIRQ is not set |
1980 | 2064 | CONFIG_DETECT_SOFTLOCKUP=y |
1981 | 2065 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
1982 | 2066 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
2067 | +CONFIG_DETECT_HUNG_TASK=y | |
2068 | +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | |
2069 | +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | |
1983 | 2070 | CONFIG_SCHED_DEBUG=y |
1984 | 2071 | CONFIG_SCHEDSTATS=y |
1985 | 2072 | # CONFIG_TIMER_STATS is not set |
... | ... | @@ -1994,6 +2081,7 @@ |
1994 | 2081 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1995 | 2082 | CONFIG_STACKTRACE=y |
1996 | 2083 | # CONFIG_DEBUG_KOBJECT is not set |
2084 | +# CONFIG_DEBUG_HIGHMEM is not set | |
1997 | 2085 | CONFIG_DEBUG_BUGVERBOSE=y |
1998 | 2086 | # CONFIG_DEBUG_INFO is not set |
1999 | 2087 | # CONFIG_DEBUG_VM is not set |
... | ... | @@ -2001,6 +2089,7 @@ |
2001 | 2089 | CONFIG_DEBUG_MEMORY_INIT=y |
2002 | 2090 | # CONFIG_DEBUG_LIST is not set |
2003 | 2091 | # CONFIG_DEBUG_SG is not set |
2092 | +# CONFIG_DEBUG_NOTIFIERS is not set | |
2004 | 2093 | # CONFIG_BOOT_PRINTK_DELAY is not set |
2005 | 2094 | # CONFIG_RCU_TORTURE_TEST is not set |
2006 | 2095 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
2007 | 2096 | |
... | ... | @@ -2009,7 +2098,14 @@ |
2009 | 2098 | # CONFIG_FAULT_INJECTION is not set |
2010 | 2099 | CONFIG_LATENCYTOP=y |
2011 | 2100 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
2101 | +CONFIG_NOP_TRACER=y | |
2012 | 2102 | CONFIG_HAVE_FUNCTION_TRACER=y |
2103 | +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |
2104 | +CONFIG_HAVE_DYNAMIC_FTRACE=y | |
2105 | +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |
2106 | +CONFIG_RING_BUFFER=y | |
2107 | +CONFIG_TRACING=y | |
2108 | +CONFIG_TRACING_SUPPORT=y | |
2013 | 2109 | |
2014 | 2110 | # |
2015 | 2111 | # Tracers |
2016 | 2112 | |
2017 | 2113 | |
2018 | 2114 | |
... | ... | @@ -2017,12 +2113,19 @@ |
2017 | 2113 | # CONFIG_FUNCTION_TRACER is not set |
2018 | 2114 | # CONFIG_SCHED_TRACER is not set |
2019 | 2115 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
2116 | +# CONFIG_EVENT_TRACER is not set | |
2020 | 2117 | # CONFIG_BOOT_TRACER is not set |
2118 | +# CONFIG_TRACE_BRANCH_PROFILING is not set | |
2021 | 2119 | # CONFIG_STACK_TRACER is not set |
2022 | -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set | |
2120 | +# CONFIG_KMEMTRACE is not set | |
2121 | +# CONFIG_WORKQUEUE_TRACER is not set | |
2122 | +# CONFIG_BLK_DEV_IO_TRACE is not set | |
2123 | +# CONFIG_FTRACE_STARTUP_TEST is not set | |
2124 | +# CONFIG_DYNAMIC_DEBUG is not set | |
2023 | 2125 | # CONFIG_SAMPLES is not set |
2024 | 2126 | CONFIG_HAVE_ARCH_KGDB=y |
2025 | 2127 | # CONFIG_KGDB is not set |
2128 | +CONFIG_PRINT_STACK_DEPTH=64 | |
2026 | 2129 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
2027 | 2130 | # CONFIG_DEBUG_STACK_USAGE is not set |
2028 | 2131 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
... | ... | @@ -2033,6 +2136,7 @@ |
2033 | 2136 | CONFIG_XMON_DISASSEMBLY=y |
2034 | 2137 | CONFIG_DEBUGGER=y |
2035 | 2138 | CONFIG_IRQSTACKS=y |
2139 | +# CONFIG_VIRQ_DEBUG is not set | |
2036 | 2140 | # CONFIG_BDI_SWITCH is not set |
2037 | 2141 | CONFIG_BOOTX_TEXT=y |
2038 | 2142 | # CONFIG_PPC_EARLY_DEBUG is not set |
2039 | 2143 | |
2040 | 2144 | |
2041 | 2145 | |
2042 | 2146 | |
2043 | 2147 | |
... | ... | @@ -2051,13 +2155,20 @@ |
2051 | 2155 | # |
2052 | 2156 | # CONFIG_CRYPTO_FIPS is not set |
2053 | 2157 | CONFIG_CRYPTO_ALGAPI=y |
2158 | +CONFIG_CRYPTO_ALGAPI2=y | |
2054 | 2159 | CONFIG_CRYPTO_AEAD=y |
2160 | +CONFIG_CRYPTO_AEAD2=y | |
2055 | 2161 | CONFIG_CRYPTO_BLKCIPHER=y |
2162 | +CONFIG_CRYPTO_BLKCIPHER2=y | |
2056 | 2163 | CONFIG_CRYPTO_HASH=y |
2057 | -CONFIG_CRYPTO_RNG=y | |
2164 | +CONFIG_CRYPTO_HASH2=y | |
2165 | +CONFIG_CRYPTO_RNG2=y | |
2166 | +CONFIG_CRYPTO_PCOMP=y | |
2058 | 2167 | CONFIG_CRYPTO_MANAGER=y |
2168 | +CONFIG_CRYPTO_MANAGER2=y | |
2059 | 2169 | # CONFIG_CRYPTO_GF128MUL is not set |
2060 | 2170 | CONFIG_CRYPTO_NULL=m |
2171 | +CONFIG_CRYPTO_WORKQUEUE=y | |
2061 | 2172 | # CONFIG_CRYPTO_CRYPTD is not set |
2062 | 2173 | CONFIG_CRYPTO_AUTHENC=y |
2063 | 2174 | # CONFIG_CRYPTO_TEST is not set |
... | ... | @@ -2127,6 +2238,7 @@ |
2127 | 2238 | # Compression |
2128 | 2239 | # |
2129 | 2240 | CONFIG_CRYPTO_DEFLATE=m |
2241 | +# CONFIG_CRYPTO_ZLIB is not set | |
2130 | 2242 | # CONFIG_CRYPTO_LZO is not set |
2131 | 2243 | |
2132 | 2244 | # |