Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/package.accept_keywords/, ...
Date: Fri, 27 Sep 2013 17:55:21
Message-Id: 1380304567.14fac58ca13c8569c8c498c7eb86931a55ab5b6f.blueness@gentoo
1 commit: 14fac58ca13c8569c8c498c7eb86931a55ab5b6f
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 27 17:56:07 2013 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 27 17:56:07 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=14fac58c
7
8 tools-uclibc/desktop: update build system for lilblue
9
10 ---
11 tools-uclibc/desktop/.gitignore | 1 +
12 tools-uclibc/desktop/config | 1065 +++++++++++++-------
13 tools-uclibc/desktop/passwd.sh | 2 +
14 tools-uclibc/desktop/portage/env/gdk-pixbuf.conf | 1 +
15 tools-uclibc/desktop/portage/env/pygobject.conf | 1 +
16 tools-uclibc/desktop/portage/make.conf.2 | 2 +-
17 .../package.accept_keywords/ExtUtils-Manifest | 1 +
18 tools-uclibc/desktop/portage/package.env | 2 +
19 tools-uclibc/desktop/portage/package.mask/openntpd | 1 -
20 tools-uclibc/desktop/portage/package.use/DirectFB | 1 +
21 tools-uclibc/desktop/run.sh | 10 +-
22 tools-uclibc/desktop/update.sh | 3 +
23 tools-uclibc/desktop/{world => world.1} | 3 -
24 tools-uclibc/desktop/{world => world.2} | 0
25 14 files changed, 710 insertions(+), 383 deletions(-)
26
27 diff --git a/tools-uclibc/desktop/.gitignore b/tools-uclibc/desktop/.gitignore
28 index a43dcbc..e58119d 100644
29 --- a/tools-uclibc/desktop/.gitignore
30 +++ b/tools-uclibc/desktop/.gitignore
31 @@ -1 +1,2 @@
32 desktop-amd64-uclibc-hardened*
33 +zzz.log
34
35 diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config
36 index f499bc1..0c9f586 100644
37 --- a/tools-uclibc/desktop/config
38 +++ b/tools-uclibc/desktop/config
39 @@ -1,6 +1,6 @@
40 #
41 # Automatically generated file; DO NOT EDIT.
42 -# Linux/x86_64 3.8.12-hardened Kernel Configuration
43 +# Linux/x86 3.11.1-hardened-r2 Kernel Configuration
44 #
45 CONFIG_64BIT=y
46 CONFIG_X86_64=y
47 @@ -18,12 +18,10 @@ CONFIG_GENERIC_ISA_DMA=y
48 CONFIG_GENERIC_BUG=y
49 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
50 CONFIG_GENERIC_HWEIGHT=y
51 -CONFIG_GENERIC_GPIO=y
52 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
53 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
54 CONFIG_GENERIC_CALIBRATE_DELAY=y
55 CONFIG_ARCH_HAS_CPU_RELAX=y
56 -CONFIG_ARCH_HAS_DEFAULT_IDLE=y
57 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
58 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
59 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
60 @@ -31,6 +29,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
61 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
62 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63 CONFIG_ARCH_SUSPEND_POSSIBLE=y
64 +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
65 +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
66 CONFIG_ZONE_DMA32=y
67 CONFIG_AUDIT_ARCH=y
68 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
69 @@ -42,16 +42,15 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
70 CONFIG_ARCH_CPU_PROBE_RELEASE=y
71 CONFIG_ARCH_SUPPORTS_UPROBES=y
72 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
73 -CONFIG_HAVE_IRQ_WORK=y
74 CONFIG_IRQ_WORK=y
75 CONFIG_BUILDTIME_EXTABLE_SORT=y
76
77 #
78 # General setup
79 #
80 -CONFIG_EXPERIMENTAL=y
81 CONFIG_INIT_ENV_ARG_LIMIT=32
82 CONFIG_CROSS_COMPILE=""
83 +# CONFIG_COMPILE_TEST is not set
84 CONFIG_LOCALVERSION=""
85 # CONFIG_LOCALVERSION_AUTO is not set
86 CONFIG_HAVE_KERNEL_GZIP=y
87 @@ -59,11 +58,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
88 CONFIG_HAVE_KERNEL_LZMA=y
89 CONFIG_HAVE_KERNEL_XZ=y
90 CONFIG_HAVE_KERNEL_LZO=y
91 +CONFIG_HAVE_KERNEL_LZ4=y
92 CONFIG_KERNEL_GZIP=y
93 # CONFIG_KERNEL_BZIP2 is not set
94 # CONFIG_KERNEL_LZMA is not set
95 # CONFIG_KERNEL_XZ is not set
96 # CONFIG_KERNEL_LZO is not set
97 +# CONFIG_KERNEL_LZ4 is not set
98 CONFIG_DEFAULT_HOSTNAME="(none)"
99 CONFIG_SWAP=y
100 CONFIG_SYSVIPC=y
101 @@ -103,14 +104,19 @@ CONFIG_GENERIC_CMOS_UPDATE=y
102 # Timers subsystem
103 #
104 CONFIG_TICK_ONESHOT=y
105 -CONFIG_NO_HZ=y
106 +CONFIG_NO_HZ_COMMON=y
107 +# CONFIG_HZ_PERIODIC is not set
108 +# CONFIG_NO_HZ_IDLE is not set
109 +CONFIG_NO_HZ_FULL=y
110 +CONFIG_NO_HZ_FULL_ALL=y
111 +# CONFIG_NO_HZ is not set
112 CONFIG_HIGH_RES_TIMERS=y
113
114 #
115 # CPU/Task time and stats accounting
116 #
117 -CONFIG_TICK_CPU_ACCOUNTING=y
118 -# CONFIG_IRQ_TIME_ACCOUNTING is not set
119 +CONFIG_VIRT_CPU_ACCOUNTING=y
120 +CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
121 CONFIG_BSD_PROCESS_ACCT=y
122 CONFIG_BSD_PROCESS_ACCT_V3=y
123 CONFIG_TASKSTATS=y
124 @@ -123,16 +129,20 @@ CONFIG_TASK_IO_ACCOUNTING=y
125 #
126 CONFIG_TREE_RCU=y
127 # CONFIG_PREEMPT_RCU is not set
128 -# CONFIG_RCU_USER_QS is not set
129 +CONFIG_RCU_STALL_COMMON=y
130 +CONFIG_CONTEXT_TRACKING=y
131 +CONFIG_RCU_USER_QS=y
132 +CONFIG_CONTEXT_TRACKING_FORCE=y
133 CONFIG_RCU_FANOUT=64
134 CONFIG_RCU_FANOUT_LEAF=16
135 # CONFIG_RCU_FANOUT_EXACT is not set
136 CONFIG_RCU_FAST_NO_HZ=y
137 # CONFIG_TREE_RCU_TRACE is not set
138 -# CONFIG_RCU_NOCB_CPU is not set
139 +CONFIG_RCU_NOCB_CPU=y
140 +CONFIG_RCU_NOCB_CPU_ALL=y
141 CONFIG_IKCONFIG=y
142 CONFIG_IKCONFIG_PROC=y
143 -CONFIG_LOG_BUF_SHIFT=17
144 +CONFIG_LOG_BUF_SHIFT=18
145 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
146 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
147 CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
148 @@ -175,22 +185,20 @@ CONFIG_RD_BZIP2=y
149 CONFIG_RD_LZMA=y
150 CONFIG_RD_XZ=y
151 CONFIG_RD_LZO=y
152 +CONFIG_RD_LZ4=y
153 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
154 CONFIG_SYSCTL=y
155 CONFIG_ANON_INODES=y
156 +CONFIG_SYSCTL_EXCEPTION_TRACE=y
157 +CONFIG_HAVE_PCSPKR_PLATFORM=y
158 CONFIG_EXPERT=y
159 -CONFIG_HAVE_UID16=y
160 -CONFIG_UID16=y
161 CONFIG_SYSCTL_SYSCALL=y
162 -CONFIG_SYSCTL_EXCEPTION_TRACE=y
163 CONFIG_KALLSYMS=y
164 CONFIG_KALLSYMS_ALL=y
165 -CONFIG_HOTPLUG=y
166 CONFIG_PRINTK=y
167 CONFIG_BUG=y
168 CONFIG_ELF_CORE=y
169 CONFIG_PCSPKR_PLATFORM=y
170 -CONFIG_HAVE_PCSPKR_PLATFORM=y
171 CONFIG_BASE_FULL=y
172 CONFIG_FUTEX=y
173 CONFIG_EPOLL=y
174 @@ -199,6 +207,7 @@ CONFIG_TIMERFD=y
175 CONFIG_EVENTFD=y
176 CONFIG_SHMEM=y
177 CONFIG_AIO=y
178 +CONFIG_PCI_QUIRKS=y
179 # CONFIG_EMBEDDED is not set
180 CONFIG_HAVE_PERF_EVENTS=y
181
182 @@ -208,14 +217,13 @@ CONFIG_HAVE_PERF_EVENTS=y
183 CONFIG_PERF_EVENTS=y
184 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
185 CONFIG_VM_EVENT_COUNTERS=y
186 -CONFIG_PCI_QUIRKS=y
187 CONFIG_SLUB_DEBUG=y
188 # CONFIG_COMPAT_BRK is not set
189 # CONFIG_SLAB is not set
190 CONFIG_SLUB=y
191 # CONFIG_SLOB is not set
192 +CONFIG_SLUB_CPU_PARTIAL=y
193 CONFIG_PROFILING=y
194 -CONFIG_TRACEPOINTS=y
195 CONFIG_OPROFILE=m
196 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
197 CONFIG_HAVE_OPROFILE=y
198 @@ -223,19 +231,22 @@ CONFIG_OPROFILE_NMI_TIMER=y
199 CONFIG_KPROBES=y
200 CONFIG_JUMP_LABEL=y
201 CONFIG_OPTPROBES=y
202 -CONFIG_UPROBES=y
203 +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
204 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
205 +CONFIG_ARCH_USE_BUILTIN_BSWAP=y
206 CONFIG_KRETPROBES=y
207 CONFIG_USER_RETURN_NOTIFIER=y
208 CONFIG_HAVE_IOREMAP_PROT=y
209 CONFIG_HAVE_KPROBES=y
210 CONFIG_HAVE_KRETPROBES=y
211 CONFIG_HAVE_OPTPROBES=y
212 +CONFIG_HAVE_KPROBES_ON_FTRACE=y
213 CONFIG_HAVE_ARCH_TRACEHOOK=y
214 CONFIG_HAVE_DMA_ATTRS=y
215 CONFIG_USE_GENERIC_SMP_HELPERS=y
216 CONFIG_GENERIC_SMP_IDLE_THREAD=y
217 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
218 +CONFIG_HAVE_CLK=y
219 CONFIG_HAVE_DMA_API_DEBUG=y
220 CONFIG_HAVE_HW_BREAKPOINT=y
221 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
222 @@ -248,15 +259,13 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
223 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
224 CONFIG_HAVE_CMPXCHG_LOCAL=y
225 CONFIG_HAVE_CMPXCHG_DOUBLE=y
226 -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
227 -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
228 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
229 CONFIG_SECCOMP_FILTER=y
230 CONFIG_HAVE_CONTEXT_TRACKING=y
231 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
232 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
233 +CONFIG_HAVE_ARCH_SOFT_DIRTY=y
234 CONFIG_MODULES_USE_ELF_RELA=y
235 -CONFIG_GENERIC_SIGALTSTACK=y
236
237 #
238 # GCOV-based kernel profiling
239 @@ -274,11 +283,13 @@ CONFIG_MODVERSIONS=y
240 CONFIG_MODULE_SRCVERSION_ALL=y
241 CONFIG_MODULE_SIG=y
242 # CONFIG_MODULE_SIG_FORCE is not set
243 +CONFIG_MODULE_SIG_ALL=y
244 # CONFIG_MODULE_SIG_SHA1 is not set
245 # CONFIG_MODULE_SIG_SHA224 is not set
246 # CONFIG_MODULE_SIG_SHA256 is not set
247 # CONFIG_MODULE_SIG_SHA384 is not set
248 CONFIG_MODULE_SIG_SHA512=y
249 +CONFIG_MODULE_SIG_HASH="sha512"
250 CONFIG_STOP_MACHINE=y
251 CONFIG_BLOCK=y
252 CONFIG_BLK_DEV_BSG=y
253 @@ -291,12 +302,13 @@ CONFIG_BLK_DEV_THROTTLING=y
254 #
255 CONFIG_PARTITION_ADVANCED=y
256 CONFIG_ACORN_PARTITION=y
257 -# CONFIG_ACORN_PARTITION_CUMANA is not set
258 -# CONFIG_ACORN_PARTITION_EESOX is not set
259 +CONFIG_ACORN_PARTITION_CUMANA=y
260 +CONFIG_ACORN_PARTITION_EESOX=y
261 CONFIG_ACORN_PARTITION_ICS=y
262 -# CONFIG_ACORN_PARTITION_ADFS is not set
263 -# CONFIG_ACORN_PARTITION_POWERTEC is not set
264 +CONFIG_ACORN_PARTITION_ADFS=y
265 +CONFIG_ACORN_PARTITION_POWERTEC=y
266 CONFIG_ACORN_PARTITION_RISCIX=y
267 +CONFIG_AIX_PARTITION=y
268 CONFIG_OSF_PARTITION=y
269 CONFIG_AMIGA_PARTITION=y
270 CONFIG_ATARI_PARTITION=y
271 @@ -314,7 +326,6 @@ CONFIG_SUN_PARTITION=y
272 CONFIG_KARMA_PARTITION=y
273 CONFIG_EFI_PARTITION=y
274 CONFIG_SYSV68_PARTITION=y
275 -CONFIG_BLOCK_COMPAT=y
276
277 #
278 # IO Schedulers
279 @@ -349,10 +360,13 @@ CONFIG_X86_EXTENDED_PLATFORM=y
280 CONFIG_X86_NUMACHIP=y
281 # CONFIG_X86_VSMP is not set
282 # CONFIG_X86_UV is not set
283 +CONFIG_X86_INTEL_LPSS=y
284 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
285 CONFIG_SCHED_OMIT_FRAME_POINTER=y
286 -CONFIG_PARAVIRT_GUEST=y
287 -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
288 +CONFIG_HYPERVISOR_GUEST=y
289 +CONFIG_PARAVIRT=y
290 +# CONFIG_PARAVIRT_DEBUG is not set
291 +CONFIG_PARAVIRT_SPINLOCKS=y
292 CONFIG_XEN=y
293 CONFIG_XEN_DOM0=y
294 CONFIG_XEN_PRIVILEGED_GUEST=y
295 @@ -361,10 +375,8 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
296 CONFIG_XEN_SAVE_RESTORE=y
297 # CONFIG_XEN_DEBUG_FS is not set
298 CONFIG_KVM_GUEST=y
299 -CONFIG_PARAVIRT=y
300 -CONFIG_PARAVIRT_SPINLOCKS=y
301 +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
302 CONFIG_PARAVIRT_CLOCK=y
303 -# CONFIG_PARAVIRT_DEBUG is not set
304 CONFIG_NO_BOOTMEM=y
305 CONFIG_MEMTEST=y
306 # CONFIG_MK8 is not set
307 @@ -412,6 +424,9 @@ CONFIG_MICROCODE=m
308 CONFIG_MICROCODE_INTEL=y
309 CONFIG_MICROCODE_AMD=y
310 CONFIG_MICROCODE_OLD_INTERFACE=y
311 +CONFIG_MICROCODE_INTEL_LIB=y
312 +# CONFIG_MICROCODE_INTEL_EARLY is not set
313 +# CONFIG_MICROCODE_AMD_EARLY is not set
314 CONFIG_X86_CPUID=m
315 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
316 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
317 @@ -441,6 +456,7 @@ CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
318 CONFIG_ARCH_DISCARD_MEMBLOCK=y
319 CONFIG_MEMORY_ISOLATION=y
320 CONFIG_MOVABLE_NODE=y
321 +CONFIG_HAVE_BOOTMEM_INFO_NODE=y
322 CONFIG_MEMORY_HOTPLUG=y
323 CONFIG_MEMORY_HOTPLUG_SPARSE=y
324 CONFIG_MEMORY_HOTREMOVE=y
325 @@ -452,6 +468,7 @@ CONFIG_MIGRATION=y
326 CONFIG_PHYS_ADDR_T_64BIT=y
327 CONFIG_ZONE_DMA_FLAG=1
328 CONFIG_BOUNCE=y
329 +CONFIG_NEED_BOUNCE_POOL=y
330 CONFIG_VIRT_TO_BUS=y
331 CONFIG_MMU_NOTIFIER=y
332 CONFIG_KSM=y
333 @@ -464,6 +481,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
334 CONFIG_CROSS_MEMORY_ATTACH=y
335 CONFIG_CLEANCACHE=y
336 CONFIG_FRONTSWAP=y
337 +CONFIG_ZBUD=y
338 +CONFIG_ZSWAP=y
339 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
340 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
341 CONFIG_X86_RESERVE_LOW=64
342 @@ -511,12 +530,17 @@ CONFIG_PM_STD_PARTITION=""
343 CONFIG_PM_SLEEP=y
344 CONFIG_PM_SLEEP_SMP=y
345 # CONFIG_PM_AUTOSLEEP is not set
346 -CONFIG_PM_WAKELOCKS=y
347 -CONFIG_PM_WAKELOCKS_LIMIT=100
348 -CONFIG_PM_WAKELOCKS_GC=y
349 +# CONFIG_PM_WAKELOCKS is not set
350 CONFIG_PM_RUNTIME=y
351 CONFIG_PM=y
352 -# CONFIG_PM_DEBUG is not set
353 +CONFIG_PM_DEBUG=y
354 +CONFIG_PM_ADVANCED_DEBUG=y
355 +# CONFIG_PM_TEST_SUSPEND is not set
356 +CONFIG_PM_SLEEP_DEBUG=y
357 +CONFIG_PM_TRACE=y
358 +CONFIG_PM_TRACE_RTC=y
359 +CONFIG_PM_CLK=y
360 +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
361 CONFIG_ACPI=y
362 CONFIG_ACPI_SLEEP=y
363 # CONFIG_ACPI_PROCFS is not set
364 @@ -541,10 +565,10 @@ CONFIG_ACPI_CUSTOM_DSDT_FILE=""
365 # CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
366 CONFIG_ACPI_BLACKLIST_YEAR=0
367 # CONFIG_ACPI_DEBUG is not set
368 -CONFIG_ACPI_PCI_SLOT=m
369 +CONFIG_ACPI_PCI_SLOT=y
370 CONFIG_X86_PM_TIMER=y
371 CONFIG_ACPI_CONTAINER=y
372 -CONFIG_ACPI_HOTPLUG_MEMORY=m
373 +CONFIG_ACPI_HOTPLUG_MEMORY=y
374 CONFIG_ACPI_SBS=m
375 CONFIG_ACPI_HED=y
376 # CONFIG_ACPI_CUSTOM_METHOD is not set
377 @@ -579,10 +603,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
378 #
379 # x86 CPU frequency scaling drivers
380 #
381 +CONFIG_X86_INTEL_PSTATE=y
382 CONFIG_X86_PCC_CPUFREQ=y
383 CONFIG_X86_ACPI_CPUFREQ=y
384 CONFIG_X86_ACPI_CPUFREQ_CPB=y
385 CONFIG_X86_POWERNOW_K8=y
386 +CONFIG_X86_AMD_FREQ_SENSITIVITY=m
387 CONFIG_X86_SPEEDSTEP_CENTRINO=y
388 CONFIG_X86_P4_CLOCKMOD=m
389
390 @@ -591,7 +617,7 @@ CONFIG_X86_P4_CLOCKMOD=m
391 #
392 CONFIG_X86_SPEEDSTEP_LIB=m
393 CONFIG_CPU_IDLE=y
394 -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
395 +CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
396 CONFIG_CPU_IDLE_GOV_LADDER=y
397 CONFIG_CPU_IDLE_GOV_MENU=y
398 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
399 @@ -636,6 +662,10 @@ CONFIG_PCI_PRI=y
400 CONFIG_PCI_PASID=y
401 CONFIG_PCI_IOAPIC=y
402 CONFIG_PCI_LABEL=y
403 +
404 +#
405 +# PCI host controller drivers
406 +#
407 CONFIG_ISA_DMA_API=y
408 CONFIG_AMD_NB=y
409 CONFIG_PCCARD=m
410 @@ -656,7 +686,7 @@ CONFIG_PD6729=m
411 CONFIG_I82092=m
412 CONFIG_PCCARD_NONSTATIC=y
413 CONFIG_HOTPLUG_PCI=y
414 -CONFIG_HOTPLUG_PCI_ACPI=m
415 +CONFIG_HOTPLUG_PCI_ACPI=y
416 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
417 CONFIG_HOTPLUG_PCI_CPCI=y
418 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
419 @@ -668,33 +698,30 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
420 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
421 CONFIG_RAPIDIO_DMA_ENGINE=y
422 # CONFIG_RAPIDIO_DEBUG is not set
423 +CONFIG_RAPIDIO_ENUM_BASIC=m
424 +
425 +#
426 +# RapidIO Switch drivers
427 +#
428 CONFIG_RAPIDIO_TSI57X=y
429 CONFIG_RAPIDIO_CPS_XX=y
430 CONFIG_RAPIDIO_TSI568=y
431 CONFIG_RAPIDIO_CPS_GEN2=y
432 -CONFIG_RAPIDIO_TSI500=y
433
434 #
435 # Executable file formats / Emulations
436 #
437 CONFIG_BINFMT_ELF=y
438 -CONFIG_COMPAT_BINFMT_ELF=y
439 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
440 -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
441 +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
442 +CONFIG_BINFMT_SCRIPT=y
443 # CONFIG_HAVE_AOUT is not set
444 CONFIG_BINFMT_MISC=m
445 CONFIG_COREDUMP=y
446 -CONFIG_IA32_EMULATION=y
447 -# CONFIG_IA32_AOUT is not set
448 -CONFIG_X86_X32=y
449 -CONFIG_COMPAT=y
450 -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
451 -CONFIG_SYSVIPC_COMPAT=y
452 -CONFIG_KEYS_COMPAT=y
453 +# CONFIG_IA32_EMULATION is not set
454 CONFIG_HAVE_TEXT_POKE_SMP=y
455 CONFIG_X86_DEV_DMA_OPS=y
456 CONFIG_NET=y
457 -CONFIG_COMPAT_NETLINK_MESSAGES=y
458
459 #
460 # Networking options
461 @@ -726,13 +753,14 @@ CONFIG_IP_PNP_DHCP=y
462 # CONFIG_IP_PNP_RARP is not set
463 CONFIG_NET_IPIP=m
464 CONFIG_NET_IPGRE_DEMUX=m
465 +CONFIG_NET_IP_TUNNEL=m
466 CONFIG_NET_IPGRE=m
467 CONFIG_NET_IPGRE_BROADCAST=y
468 CONFIG_IP_MROUTE=y
469 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
470 CONFIG_IP_PIMSM_V1=y
471 CONFIG_IP_PIMSM_V2=y
472 -# CONFIG_ARPD is not set
473 +CONFIG_ARPD=y
474 CONFIG_SYN_COOKIES=y
475 CONFIG_NET_IPVTI=m
476 CONFIG_INET_AH=m
477 @@ -811,6 +839,7 @@ CONFIG_NF_CONNTRACK_ZONES=y
478 CONFIG_NF_CONNTRACK_EVENTS=y
479 CONFIG_NF_CONNTRACK_TIMEOUT=y
480 CONFIG_NF_CONNTRACK_TIMESTAMP=y
481 +CONFIG_NF_CONNTRACK_LABELS=y
482 CONFIG_NF_CT_PROTO_DCCP=m
483 CONFIG_NF_CT_PROTO_GRE=m
484 CONFIG_NF_CT_PROTO_SCTP=m
485 @@ -883,9 +912,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
486 # Xtables matches
487 #
488 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
489 +CONFIG_NETFILTER_XT_MATCH_BPF=m
490 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
491 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
492 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
493 +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
494 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
495 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
496 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
497 @@ -895,7 +926,7 @@ CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
498 CONFIG_NETFILTER_XT_MATCH_DSCP=m
499 CONFIG_NETFILTER_XT_MATCH_ECN=m
500 CONFIG_NETFILTER_XT_MATCH_ESP=m
501 -# CONFIG_NETFILTER_XT_MATCH_GRADM is not set
502 +CONFIG_NETFILTER_XT_MATCH_GRADM=m
503 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
504 CONFIG_NETFILTER_XT_MATCH_HELPER=m
505 CONFIG_NETFILTER_XT_MATCH_HL=m
506 @@ -983,7 +1014,6 @@ CONFIG_IP_VS_PE_SIP=m
507 #
508 CONFIG_NF_DEFRAG_IPV4=m
509 CONFIG_NF_CONNTRACK_IPV4=m
510 -# CONFIG_IP_NF_QUEUE is not set
511 CONFIG_IP_NF_IPTABLES=m
512 CONFIG_IP_NF_MATCH_AH=m
513 CONFIG_IP_NF_MATCH_ECN=m
514 @@ -1063,7 +1093,7 @@ CONFIG_IP_DCCP=m
515 CONFIG_INET_DCCP_DIAG=m
516
517 #
518 -# DCCP CCIDs Configuration (EXPERIMENTAL)
519 +# DCCP CCIDs Configuration
520 #
521 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
522 # CONFIG_IP_DCCP_CCID3 is not set
523 @@ -1075,7 +1105,6 @@ CONFIG_INET_DCCP_DIAG=m
524 CONFIG_NET_DCCPPROBE=m
525 CONFIG_IP_SCTP=m
526 CONFIG_NET_SCTPPROBE=m
527 -# CONFIG_SCTP_DBG_MSG is not set
528 # CONFIG_SCTP_DBG_OBJCNT is not set
529 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
530 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
531 @@ -1088,6 +1117,7 @@ CONFIG_RDS_TCP=m
532 # CONFIG_RDS_DEBUG is not set
533 CONFIG_TIPC=m
534 CONFIG_TIPC_PORTS=8191
535 +CONFIG_TIPC_MEDIA_IB=y
536 CONFIG_ATM=m
537 CONFIG_ATM_CLIP=m
538 # CONFIG_ATM_CLIP_NO_ICMP is not set
539 @@ -1100,8 +1130,10 @@ CONFIG_L2TP_DEBUGFS=m
540 # CONFIG_L2TP_V3 is not set
541 CONFIG_STP=m
542 CONFIG_GARP=m
543 +CONFIG_MRP=m
544 CONFIG_BRIDGE=m
545 CONFIG_BRIDGE_IGMP_SNOOPING=y
546 +CONFIG_BRIDGE_VLAN_FILTERING=y
547 CONFIG_HAVE_NET_DSA=y
548 CONFIG_NET_DSA=m
549 CONFIG_NET_DSA_TAG_DSA=y
550 @@ -1109,6 +1141,7 @@ CONFIG_NET_DSA_TAG_EDSA=y
551 CONFIG_NET_DSA_TAG_TRAILER=y
552 CONFIG_VLAN_8021Q=m
553 CONFIG_VLAN_8021Q_GVRP=y
554 +CONFIG_VLAN_8021Q_MVRP=y
555 CONFIG_DECNET=m
556 # CONFIG_DECNET_ROUTER is not set
557 CONFIG_LLC=m
558 @@ -1119,10 +1152,8 @@ CONFIG_ATALK=m
559 CONFIG_DEV_APPLETALK=m
560 CONFIG_IPDDP=m
561 CONFIG_IPDDP_ENCAP=y
562 -CONFIG_IPDDP_DECAP=y
563 CONFIG_X25=m
564 CONFIG_LAPB=m
565 -CONFIG_WAN_ROUTER=m
566 CONFIG_PHONET=m
567 CONFIG_IEEE802154=m
568 CONFIG_IEEE802154_6LOWPAN=m
569 @@ -1197,21 +1228,29 @@ CONFIG_DNS_RESOLVER=y
570 CONFIG_BATMAN_ADV=m
571 CONFIG_BATMAN_ADV_BLA=y
572 CONFIG_BATMAN_ADV_DAT=y
573 +CONFIG_BATMAN_ADV_NC=y
574 # CONFIG_BATMAN_ADV_DEBUG is not set
575 CONFIG_OPENVSWITCH=m
576 +CONFIG_OPENVSWITCH_GRE=y
577 +CONFIG_VSOCKETS=m
578 +CONFIG_VMWARE_VMCI_VSOCKETS=m
579 +CONFIG_NETLINK_MMAP=y
580 +CONFIG_NETLINK_DIAG=m
581 +CONFIG_NET_MPLS_GSO=m
582 CONFIG_RPS=y
583 CONFIG_RFS_ACCEL=y
584 CONFIG_XPS=y
585 CONFIG_NETPRIO_CGROUP=m
586 +CONFIG_NET_RX_BUSY_POLL=y
587 CONFIG_BQL=y
588 CONFIG_BPF_JIT=y
589 +CONFIG_NET_FLOW_LIMIT=y
590
591 #
592 # Network testing
593 #
594 CONFIG_NET_PKTGEN=m
595 CONFIG_NET_TCPPROBE=m
596 -# CONFIG_NET_DROP_MONITOR is not set
597 CONFIG_HAMRADIO=y
598
599 #
600 @@ -1244,6 +1283,7 @@ CONFIG_CAN_VCAN=m
601 CONFIG_CAN_SLCAN=m
602 CONFIG_CAN_DEV=m
603 CONFIG_CAN_CALC_BITTIMING=y
604 +CONFIG_CAN_LEDS=y
605 CONFIG_CAN_MCP251X=m
606 CONFIG_CAN_JANZ_ICAN3=m
607 CONFIG_PCH_CAN=m
608 @@ -1271,6 +1311,7 @@ CONFIG_CAN_EMS_USB=m
609 CONFIG_CAN_ESD_USB2=m
610 CONFIG_CAN_KVASER_USB=m
611 CONFIG_CAN_PEAK_USB=m
612 +CONFIG_CAN_8DEV_USB=m
613 CONFIG_CAN_SOFTING=m
614 CONFIG_CAN_SOFTING_CS=m
615 # CONFIG_CAN_DEBUG_DEVICES is not set
616 @@ -1405,6 +1446,7 @@ CONFIG_RFKILL=y
617 CONFIG_RFKILL_LEDS=y
618 CONFIG_RFKILL_INPUT=y
619 CONFIG_RFKILL_REGULATOR=m
620 +CONFIG_RFKILL_GPIO=m
621 CONFIG_NET_9P=m
622 CONFIG_NET_9P_VIRTIO=m
623 CONFIG_NET_9P_RDMA=m
624 @@ -1418,16 +1460,23 @@ CONFIG_CEPH_LIB=m
625 CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
626 CONFIG_NFC=m
627 CONFIG_NFC_NCI=m
628 +CONFIG_NFC_NCI_SPI=y
629 CONFIG_NFC_HCI=m
630 CONFIG_NFC_SHDLC=y
631 -CONFIG_NFC_LLCP=y
632
633 #
634 # Near Field Communication (NFC) devices
635 #
636 -CONFIG_PN544_HCI_NFC=m
637 CONFIG_NFC_PN533=m
638 CONFIG_NFC_WILINK=m
639 +CONFIG_NFC_MEI_PHY=m
640 +CONFIG_NFC_SIM=m
641 +CONFIG_NFC_PN544=m
642 +CONFIG_NFC_PN544_I2C=m
643 +CONFIG_NFC_PN544_MEI=m
644 +CONFIG_NFC_MICROREAD=m
645 +CONFIG_NFC_MICROREAD_I2C=m
646 +CONFIG_NFC_MICROREAD_MEI=m
647 CONFIG_HAVE_BPF_JIT=y
648
649 #
650 @@ -1445,6 +1494,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
651 CONFIG_FW_LOADER=y
652 CONFIG_FIRMWARE_IN_KERNEL=y
653 CONFIG_EXTRA_FIRMWARE=""
654 +CONFIG_FW_LOADER_USER_HELPER=y
655 # CONFIG_DEBUG_DRIVER is not set
656 # CONFIG_DEBUG_DEVRES is not set
657 CONFIG_SYS_HYPERVISOR=y
658 @@ -1452,7 +1502,7 @@ CONFIG_SYS_HYPERVISOR=y
659 CONFIG_REGMAP=y
660 CONFIG_REGMAP_I2C=y
661 CONFIG_REGMAP_SPI=y
662 -CONFIG_REGMAP_MMIO=m
663 +CONFIG_REGMAP_MMIO=y
664 CONFIG_REGMAP_IRQ=y
665 CONFIG_DMA_SHARED_BUFFER=y
666
667 @@ -1467,13 +1517,12 @@ CONFIG_MTD_REDBOOT_PARTS=m
668 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
669 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
670 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
671 +CONFIG_MTD_CMDLINE_PARTS=m
672 CONFIG_MTD_AR7_PARTS=m
673
674 #
675 # User Modules And Translation Layers
676 #
677 -CONFIG_MTD_CHAR=m
678 -CONFIG_HAVE_MTD_OTP=y
679 CONFIG_MTD_BLKDEVS=m
680 CONFIG_MTD_BLOCK=m
681 CONFIG_MTD_BLOCK_RO=m
682 @@ -1559,25 +1608,18 @@ CONFIG_MTD_BLOCK2MTD=m
683 #
684 # Disk-On-Chip Device Drivers
685 #
686 -# CONFIG_MTD_DOC2000 is not set
687 -# CONFIG_MTD_DOC2001 is not set
688 -CONFIG_MTD_DOC2001PLUS=m
689 CONFIG_MTD_DOCG3=m
690 CONFIG_BCH_CONST_M=14
691 CONFIG_BCH_CONST_T=4
692 -CONFIG_MTD_DOCPROBE=m
693 -CONFIG_MTD_DOCECC=m
694 -# CONFIG_MTD_DOCPROBE_ADVANCED is not set
695 -CONFIG_MTD_DOCPROBE_ADDRESS=0x0
696 CONFIG_MTD_NAND_ECC=m
697 # CONFIG_MTD_NAND_ECC_SMC is not set
698 CONFIG_MTD_NAND=m
699 CONFIG_MTD_NAND_BCH=m
700 CONFIG_MTD_NAND_ECC_BCH=y
701 CONFIG_MTD_SM_COMMON=m
702 -# CONFIG_MTD_NAND_MUSEUM_IDS is not set
703 CONFIG_MTD_NAND_DENALI=m
704 CONFIG_MTD_NAND_DENALI_PCI=m
705 +CONFIG_MTD_NAND_DENALI_DT=m
706 CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
707 CONFIG_MTD_NAND_IDS=m
708 CONFIG_MTD_NAND_RICOH=m
709 @@ -1595,7 +1637,6 @@ CONFIG_MTD_ONENAND_VERIFY_WRITE=y
710 CONFIG_MTD_ONENAND_GENERIC=m
711 # CONFIG_MTD_ONENAND_OTP is not set
712 CONFIG_MTD_ONENAND_2X_PROGRAM=y
713 -# CONFIG_MTD_ONENAND_SIM is not set
714
715 #
716 # LPDDR flash memory drivers
717 @@ -1610,7 +1651,7 @@ CONFIG_MTD_UBI_GLUEBI=m
718 CONFIG_PARPORT=m
719 CONFIG_PARPORT_PC=m
720 CONFIG_PARPORT_SERIAL=m
721 -# CONFIG_PARPORT_PC_FIFO is not set
722 +CONFIG_PARPORT_PC_FIFO=y
723 # CONFIG_PARPORT_PC_SUPERIO is not set
724 CONFIG_PARPORT_PC_PCMCIA=m
725 # CONFIG_PARPORT_GSC is not set
726 @@ -1684,6 +1725,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m
727 CONFIG_VIRTIO_BLK=y
728 # CONFIG_BLK_DEV_HD is not set
729 CONFIG_BLK_DEV_RBD=m
730 +CONFIG_BLK_DEV_RSXX=m
731
732 #
733 # Misc devices
734 @@ -1692,15 +1734,19 @@ CONFIG_SENSORS_LIS3LV02D=m
735 CONFIG_AD525X_DPOT=m
736 CONFIG_AD525X_DPOT_I2C=m
737 CONFIG_AD525X_DPOT_SPI=m
738 +CONFIG_ATMEL_PWM=m
739 +CONFIG_DUMMY_IRQ=m
740 CONFIG_IBM_ASM=m
741 CONFIG_PHANTOM=m
742 -CONFIG_INTEL_MID_PTI=m
743 CONFIG_SGI_IOC4=m
744 CONFIG_TIFM_CORE=m
745 CONFIG_TIFM_7XX1=m
746 CONFIG_ICS932S401=m
747 +CONFIG_ATMEL_SSC=m
748 CONFIG_ENCLOSURE_SERVICES=m
749 -# CONFIG_CS5535_MFGPT is not set
750 +CONFIG_CS5535_MFGPT=m
751 +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
752 +CONFIG_CS5535_CLOCK_EVENT_SRC=m
753 CONFIG_HP_ILO=m
754 CONFIG_APDS9802ALS=m
755 CONFIG_ISL29003=m
756 @@ -1718,6 +1764,8 @@ CONFIG_BMP085_I2C=m
757 CONFIG_BMP085_SPI=m
758 CONFIG_PCH_PHUB=m
759 CONFIG_USB_SWITCH_FSA9480=m
760 +CONFIG_LATTICE_ECP3_CONFIG=m
761 +CONFIG_SRAM=y
762 CONFIG_C2PORT=m
763 CONFIG_C2PORT_DURAMAR_2150=m
764
765 @@ -1745,6 +1793,8 @@ CONFIG_SENSORS_LIS3_I2C=m
766 #
767 CONFIG_ALTERA_STAPL=m
768 CONFIG_INTEL_MEI=m
769 +CONFIG_INTEL_MEI_ME=m
770 +CONFIG_VMWARE_VMCI=m
771 CONFIG_HAVE_IDE=y
772 # CONFIG_IDE is not set
773
774 @@ -1836,8 +1886,11 @@ CONFIG_SCSI_MPT3SAS=m
775 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
776 # CONFIG_SCSI_MPT3SAS_LOGGING is not set
777 CONFIG_SCSI_UFSHCD=m
778 +CONFIG_SCSI_UFSHCD_PCI=m
779 +CONFIG_SCSI_UFSHCD_PLATFORM=m
780 CONFIG_SCSI_HPTIOP=m
781 CONFIG_SCSI_BUSLOGIC=m
782 +CONFIG_SCSI_FLASHPOINT=y
783 CONFIG_VMWARE_PVSCSI=m
784 CONFIG_HYPERV_STORAGE=m
785 CONFIG_LIBFC=m
786 @@ -1901,6 +1954,7 @@ CONFIG_ATA=y
787 # CONFIG_ATA_NONSTANDARD is not set
788 CONFIG_ATA_VERBOSE_ERROR=y
789 CONFIG_ATA_ACPI=y
790 +CONFIG_SATA_ZPODD=y
791 CONFIG_SATA_PMP=y
792
793 #
794 @@ -1908,6 +1962,7 @@ CONFIG_SATA_PMP=y
795 #
796 CONFIG_SATA_AHCI=m
797 CONFIG_SATA_AHCI_PLATFORM=m
798 +CONFIG_AHCI_IMX=m
799 CONFIG_SATA_INIC162X=m
800 CONFIG_SATA_ACARD_AHCI=m
801 CONFIG_SATA_SIL24=m
802 @@ -1925,10 +1980,11 @@ CONFIG_ATA_BMDMA=y
803 # SATA SFF controllers with BMDMA
804 #
805 CONFIG_ATA_PIIX=y
806 -# CONFIG_SATA_HIGHBANK is not set
807 +CONFIG_SATA_HIGHBANK=m
808 CONFIG_SATA_MV=m
809 CONFIG_SATA_NV=m
810 CONFIG_SATA_PROMISE=m
811 +CONFIG_SATA_RCAR=m
812 CONFIG_SATA_SIL=m
813 CONFIG_SATA_SIS=m
814 CONFIG_SATA_SVW=m
815 @@ -2004,9 +2060,12 @@ CONFIG_MD_RAID0=m
816 CONFIG_MD_RAID1=m
817 CONFIG_MD_RAID10=m
818 CONFIG_MD_RAID456=m
819 -# CONFIG_MULTICORE_RAID456 is not set
820 CONFIG_MD_MULTIPATH=m
821 CONFIG_MD_FAULTY=m
822 +CONFIG_BCACHE=m
823 +# CONFIG_BCACHE_DEBUG is not set
824 +# CONFIG_BCACHE_EDEBUG is not set
825 +# CONFIG_BCACHE_CLOSURES_DEBUG is not set
826 CONFIG_BLK_DEV_DM=y
827 # CONFIG_DM_DEBUG is not set
828 CONFIG_DM_BUFIO=m
829 @@ -2016,6 +2075,9 @@ CONFIG_DM_CRYPT=m
830 CONFIG_DM_SNAPSHOT=m
831 CONFIG_DM_THIN_PROVISIONING=m
832 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
833 +CONFIG_DM_CACHE=m
834 +CONFIG_DM_CACHE_MQ=m
835 +CONFIG_DM_CACHE_CLEANER=m
836 CONFIG_DM_MIRROR=m
837 CONFIG_DM_RAID=m
838 CONFIG_DM_LOG_USERSPACE=m
839 @@ -2027,6 +2089,7 @@ CONFIG_DM_DELAY=m
840 CONFIG_DM_UEVENT=y
841 CONFIG_DM_FLAKEY=m
842 CONFIG_DM_VERITY=m
843 +CONFIG_DM_SWITCH=m
844 CONFIG_TARGET_CORE=m
845 CONFIG_TCM_IBLOCK=m
846 CONFIG_TCM_FILEIO=m
847 @@ -2065,12 +2128,12 @@ CONFIG_I2O_PROC=m
848 CONFIG_MACINTOSH_DRIVERS=y
849 CONFIG_MAC_EMUMOUSEBTN=m
850 CONFIG_NETDEVICES=y
851 +CONFIG_MII=m
852 CONFIG_NET_CORE=y
853 CONFIG_BONDING=m
854 CONFIG_DUMMY=m
855 CONFIG_EQUALIZER=m
856 CONFIG_NET_FC=y
857 -CONFIG_MII=y
858 CONFIG_IFB=m
859 # CONFIG_NET_TEAM is not set
860 CONFIG_MACVLAN=m
861 @@ -2081,12 +2144,14 @@ CONFIG_NETCONSOLE_DYNAMIC=y
862 CONFIG_NETPOLL=y
863 # CONFIG_NETPOLL_TRAP is not set
864 CONFIG_NET_POLL_CONTROLLER=y
865 +CONFIG_NTB_NETDEV=m
866 CONFIG_RIONET=m
867 CONFIG_RIONET_TX_SIZE=128
868 CONFIG_RIONET_RX_SIZE=128
869 CONFIG_TUN=y
870 CONFIG_VETH=m
871 CONFIG_VIRTIO_NET=y
872 +CONFIG_NLMON=m
873 CONFIG_SUNGEM_PHY=m
874 CONFIG_ARCNET=m
875 CONFIG_ARCNET_1201=m
876 @@ -2137,6 +2202,11 @@ CONFIG_CAIF_TTY=m
877 CONFIG_CAIF_SPI_SLAVE=m
878 # CONFIG_CAIF_SPI_SYNC is not set
879 CONFIG_CAIF_HSI=m
880 +CONFIG_CAIF_VIRTIO=m
881 +CONFIG_VHOST_NET=m
882 +CONFIG_VHOST_SCSI=m
883 +CONFIG_VHOST_RING=m
884 +CONFIG_VHOST=m
885
886 #
887 # Distributed Switch Architecture drivers
888 @@ -2162,11 +2232,13 @@ CONFIG_NET_VENDOR_AMD=y
889 CONFIG_AMD8111_ETH=m
890 CONFIG_PCNET32=m
891 CONFIG_PCMCIA_NMCLAN=m
892 +CONFIG_NET_VENDOR_ARC=y
893 CONFIG_NET_VENDOR_ATHEROS=y
894 CONFIG_ATL2=m
895 CONFIG_ATL1=m
896 CONFIG_ATL1E=m
897 CONFIG_ATL1C=m
898 +CONFIG_ALX=m
899 CONFIG_NET_CADENCE=y
900 CONFIG_ARM_AT91_ETHER=m
901 CONFIG_MACB=m
902 @@ -2179,6 +2251,7 @@ CONFIG_BNX2=m
903 CONFIG_CNIC=m
904 CONFIG_TIGON3=m
905 CONFIG_BNX2X=m
906 +CONFIG_BNX2X_SRIOV=y
907 CONFIG_NET_VENDOR_BROCADE=y
908 CONFIG_BNA=m
909 CONFIG_NET_CALXEDA_XGMAC=m
910 @@ -2205,8 +2278,6 @@ CONFIG_DM9102=m
911 CONFIG_ULI526X=m
912 CONFIG_PCMCIA_XIRCOM=m
913 CONFIG_NET_VENDOR_DLINK=y
914 -CONFIG_DE600=m
915 -CONFIG_DE620=m
916 CONFIG_DL2K=m
917 CONFIG_SUNDANCE=m
918 # CONFIG_SUNDANCE_MMIO is not set
919 @@ -2225,6 +2296,7 @@ CONFIG_E100=m
920 CONFIG_E1000=m
921 CONFIG_E1000E=m
922 CONFIG_IGB=m
923 +CONFIG_IGB_HWMON=y
924 CONFIG_IGB_DCA=y
925 CONFIG_IGBVF=m
926 CONFIG_IXGB=m
927 @@ -2234,7 +2306,6 @@ CONFIG_IXGBE_DCA=y
928 CONFIG_IXGBE_DCB=y
929 CONFIG_IXGBEVF=m
930 CONFIG_NET_VENDOR_I825XX=y
931 -CONFIG_ZNET=m
932 CONFIG_IP1000=m
933 CONFIG_JME=m
934 CONFIG_NET_VENDOR_MARVELL=y
935 @@ -2249,6 +2320,8 @@ CONFIG_MLX4_EN=m
936 CONFIG_MLX4_EN_DCB=y
937 CONFIG_MLX4_CORE=m
938 # CONFIG_MLX4_DEBUG is not set
939 +CONFIG_MLX5_CORE=m
940 +# CONFIG_MLX5_DEBUG is not set
941 CONFIG_NET_VENDOR_MICREL=y
942 CONFIG_KS8842=m
943 CONFIG_KS8851=m
944 @@ -2279,6 +2352,7 @@ CONFIG_YELLOWFIN=m
945 CONFIG_NET_VENDOR_QLOGIC=y
946 CONFIG_QLA3XXX=m
947 CONFIG_QLCNIC=m
948 +CONFIG_QLCNIC_SRIOV=y
949 CONFIG_QLGE=m
950 CONFIG_NETXEN_NIC=m
951 CONFIG_NET_VENDOR_REALTEK=y
952 @@ -2290,10 +2364,10 @@ CONFIG_8139TOO_PIO=y
953 CONFIG_8139TOO_8129=y
954 # CONFIG_8139_OLD_RX_RESET is not set
955 CONFIG_R8169=m
956 +CONFIG_SH_ETH=m
957 CONFIG_NET_VENDOR_RDC=y
958 CONFIG_R6040=m
959 CONFIG_NET_VENDOR_SEEQ=y
960 -CONFIG_SEEQ8005=m
961 CONFIG_NET_VENDOR_SILAN=y
962 CONFIG_SC92031=m
963 CONFIG_NET_VENDOR_SIS=y
964 @@ -2306,6 +2380,8 @@ CONFIG_SFC_SRIOV=y
965 CONFIG_NET_VENDOR_SMSC=y
966 CONFIG_PCMCIA_SMC91C92=m
967 CONFIG_EPIC100=m
968 +CONFIG_SMSC911X=m
969 +# CONFIG_SMSC911X_ARCH_HOOKS is not set
970 CONFIG_SMSC9420=m
971 CONFIG_NET_VENDOR_STMICRO=y
972 CONFIG_STMMAC_ETH=m
973 @@ -2313,8 +2389,6 @@ CONFIG_STMMAC_PLATFORM=y
974 # CONFIG_STMMAC_PCI is not set
975 # CONFIG_STMMAC_DEBUG_FS is not set
976 # CONFIG_STMMAC_DA is not set
977 -CONFIG_STMMAC_RING=y
978 -# CONFIG_STMMAC_CHAINED is not set
979 CONFIG_NET_VENDOR_SUN=y
980 CONFIG_HAPPYMEAL=m
981 CONFIG_SUNGEM=m
982 @@ -2394,8 +2468,10 @@ CONFIG_USB_CATC=m
983 CONFIG_USB_KAWETH=m
984 CONFIG_USB_PEGASUS=m
985 CONFIG_USB_RTL8150=m
986 +CONFIG_USB_RTL8152=m
987 CONFIG_USB_USBNET=m
988 CONFIG_USB_NET_AX8817X=m
989 +CONFIG_USB_NET_AX88179_178A=m
990 CONFIG_USB_NET_CDCETHER=m
991 CONFIG_USB_NET_CDC_EEM=m
992 CONFIG_USB_NET_CDC_NCM=m
993 @@ -2451,7 +2527,6 @@ CONFIG_ATH_CARDS=m
994 # CONFIG_ATH_DEBUG is not set
995 CONFIG_ATH5K=m
996 # CONFIG_ATH5K_DEBUG is not set
997 -# CONFIG_ATH5K_TRACER is not set
998 CONFIG_ATH5K_PCI=y
999 CONFIG_ATH9K_HW=m
1000 CONFIG_ATH9K_COMMON=m
1001 @@ -2460,8 +2535,7 @@ CONFIG_ATH9K=m
1002 CONFIG_ATH9K_PCI=y
1003 CONFIG_ATH9K_AHB=y
1004 CONFIG_ATH9K_DEBUGFS=y
1005 -# CONFIG_ATH9K_MAC_DEBUG is not set
1006 -CONFIG_ATH9K_RATE_CONTROL=y
1007 +CONFIG_ATH9K_LEGACY_RATE_CONTROL=y
1008 CONFIG_ATH9K_HTC=m
1009 CONFIG_ATH9K_HTC_DEBUGFS=y
1010 CONFIG_CARL9170=m
1011 @@ -2476,9 +2550,12 @@ CONFIG_ATH6KL_USB=m
1012 CONFIG_AR5523=m
1013 CONFIG_WIL6210=m
1014 CONFIG_WIL6210_ISR_COR=y
1015 +CONFIG_ATH10K=m
1016 +CONFIG_ATH10K_PCI=m
1017 +# CONFIG_ATH10K_DEBUG is not set
1018 +CONFIG_ATH10K_DEBUGFS=y
1019 CONFIG_B43=m
1020 CONFIG_B43_BCMA=y
1021 -# CONFIG_B43_BCMA_EXTRA is not set
1022 CONFIG_B43_SSB=y
1023 CONFIG_B43_PCI_AUTOSELECT=y
1024 CONFIG_B43_PCICORE_AUTOSELECT=y
1025 @@ -2507,7 +2584,6 @@ CONFIG_BRCMUTIL=m
1026 CONFIG_BRCMSMAC=m
1027 CONFIG_BRCMFMAC=m
1028 CONFIG_BRCMFMAC_SDIO=y
1029 -CONFIG_BRCMFMAC_SDIO_OOB=y
1030 CONFIG_BRCMFMAC_USB=y
1031 CONFIG_BRCM_TRACING=y
1032 # CONFIG_BRCMDBG is not set
1033 @@ -2530,14 +2606,14 @@ CONFIG_LIBIPW=m
1034 # CONFIG_LIBIPW_DEBUG is not set
1035 CONFIG_IWLWIFI=m
1036 CONFIG_IWLDVM=m
1037 +CONFIG_IWLMVM=m
1038 +CONFIG_IWLWIFI_OPMODE_MODULAR=y
1039
1040 #
1041 # Debugging Options
1042 #
1043 # CONFIG_IWLWIFI_DEBUG is not set
1044 CONFIG_IWLWIFI_DEBUGFS=y
1045 -CONFIG_IWLWIFI_DEVICE_TRACING=y
1046 -CONFIG_IWLWIFI_DEVICE_TESTMODE=y
1047 # CONFIG_IWLWIFI_P2P is not set
1048 CONFIG_IWLEGACY=m
1049 CONFIG_IWL4965=m
1050 @@ -2585,8 +2661,10 @@ CONFIG_RT2800USB=m
1051 CONFIG_RT2800USB_RT33XX=y
1052 CONFIG_RT2800USB_RT35XX=y
1053 CONFIG_RT2800USB_RT53XX=y
1054 +CONFIG_RT2800USB_RT55XX=y
1055 CONFIG_RT2800USB_UNKNOWN=y
1056 CONFIG_RT2800_LIB=m
1057 +CONFIG_RT2X00_LIB_MMIO=m
1058 CONFIG_RT2X00_LIB_PCI=m
1059 CONFIG_RT2X00_LIB_USB=m
1060 CONFIG_RT2X00_LIB=m
1061 @@ -2595,12 +2673,16 @@ CONFIG_RT2X00_LIB_CRYPTO=y
1062 CONFIG_RT2X00_LIB_LEDS=y
1063 # CONFIG_RT2X00_LIB_DEBUGFS is not set
1064 # CONFIG_RT2X00_DEBUG is not set
1065 +CONFIG_RTL_CARDS=m
1066 CONFIG_RTL8192CE=m
1067 CONFIG_RTL8192SE=m
1068 CONFIG_RTL8192DE=m
1069 CONFIG_RTL8723AE=m
1070 +CONFIG_RTL8188EE=m
1071 CONFIG_RTL8192CU=m
1072 CONFIG_RTLWIFI=m
1073 +CONFIG_RTLWIFI_PCI=m
1074 +CONFIG_RTLWIFI_USB=m
1075 # CONFIG_RTLWIFI_DEBUG is not set
1076 CONFIG_RTL8192C_COMMON=m
1077 CONFIG_WL_TI=y
1078 @@ -2612,13 +2694,16 @@ CONFIG_WL18XX=m
1079 CONFIG_WLCORE=m
1080 CONFIG_WLCORE_SPI=m
1081 CONFIG_WLCORE_SDIO=m
1082 -CONFIG_WL12XX_PLATFORM_DATA=y
1083 +CONFIG_WILINK_PLATFORM_DATA=y
1084 CONFIG_ZD1211RW=m
1085 # CONFIG_ZD1211RW_DEBUG is not set
1086 CONFIG_MWIFIEX=m
1087 CONFIG_MWIFIEX_SDIO=m
1088 CONFIG_MWIFIEX_PCIE=m
1089 CONFIG_MWIFIEX_USB=m
1090 +CONFIG_CW1200=m
1091 +CONFIG_CW1200_WLAN_SDIO=m
1092 +CONFIG_CW1200_WLAN_SPI=m
1093
1094 #
1095 # WiMAX Wireless Broadband devices
1096 @@ -2644,9 +2729,6 @@ CONFIG_DSCC4_PCISYNC=y
1097 CONFIG_DSCC4_PCI_RST=y
1098 CONFIG_DLCI=m
1099 CONFIG_DLCI_MAX=8
1100 -CONFIG_WAN_ROUTER_DRIVERS=m
1101 -CONFIG_CYCLADES_SYNC=m
1102 -CONFIG_CYCLOMX_X25=y
1103 CONFIG_LAPBETHER=m
1104 CONFIG_X25_ASY=m
1105 CONFIG_SBNI=m
1106 @@ -2835,17 +2917,19 @@ CONFIG_KEYBOARD_MCS=m
1107 CONFIG_KEYBOARD_MPR121=m
1108 CONFIG_KEYBOARD_NEWTON=m
1109 CONFIG_KEYBOARD_OPENCORES=m
1110 +CONFIG_KEYBOARD_SAMSUNG=m
1111 CONFIG_KEYBOARD_STOWAWAY=m
1112 CONFIG_KEYBOARD_SUNKBD=m
1113 CONFIG_KEYBOARD_STMPE=m
1114 CONFIG_KEYBOARD_TC3589X=m
1115 -CONFIG_KEYBOARD_TWL4030=m
1116 CONFIG_KEYBOARD_XTKBD=m
1117 +CONFIG_KEYBOARD_CROS_EC=m
1118 CONFIG_INPUT_MOUSE=y
1119 CONFIG_MOUSE_PS2=m
1120 CONFIG_MOUSE_PS2_ALPS=y
1121 CONFIG_MOUSE_PS2_LOGIPS2PP=y
1122 CONFIG_MOUSE_PS2_SYNAPTICS=y
1123 +CONFIG_MOUSE_PS2_CYPRESS=y
1124 CONFIG_MOUSE_PS2_LIFEBOOK=y
1125 CONFIG_MOUSE_PS2_TRACKPOINT=y
1126 CONFIG_MOUSE_PS2_ELANTECH=y
1127 @@ -2854,6 +2938,7 @@ CONFIG_MOUSE_PS2_TOUCHKIT=y
1128 CONFIG_MOUSE_SERIAL=m
1129 CONFIG_MOUSE_APPLETOUCH=m
1130 CONFIG_MOUSE_BCM5974=m
1131 +CONFIG_MOUSE_CYAPA=m
1132 CONFIG_MOUSE_VSXXXAA=m
1133 CONFIG_MOUSE_GPIO=m
1134 CONFIG_MOUSE_SYNAPTICS_I2C=m
1135 @@ -2910,6 +2995,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
1136 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
1137 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
1138 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
1139 +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
1140 +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
1141 +CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
1142 CONFIG_TOUCHSCREEN_DA9034=m
1143 CONFIG_TOUCHSCREEN_DA9052=m
1144 CONFIG_TOUCHSCREEN_DYNAPRO=m
1145 @@ -2963,6 +3051,7 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m
1146 CONFIG_TOUCHSCREEN_TSC_SERIO=m
1147 CONFIG_TOUCHSCREEN_TSC2005=m
1148 CONFIG_TOUCHSCREEN_TSC2007=m
1149 +CONFIG_TOUCHSCREEN_W90X900=m
1150 CONFIG_TOUCHSCREEN_PCAP=m
1151 CONFIG_TOUCHSCREEN_ST1232=m
1152 CONFIG_TOUCHSCREEN_STMPE=m
1153 @@ -2992,8 +3081,6 @@ CONFIG_INPUT_POWERMATE=m
1154 CONFIG_INPUT_YEALINK=m
1155 CONFIG_INPUT_CM109=m
1156 CONFIG_INPUT_RETU_PWRBUTTON=m
1157 -CONFIG_INPUT_TWL4030_PWRBUTTON=m
1158 -CONFIG_INPUT_TWL4030_VIBRA=m
1159 CONFIG_INPUT_TWL6040_VIBRA=m
1160 CONFIG_INPUT_UINPUT=y
1161 CONFIG_INPUT_PCF50633_PMU=m
1162 @@ -3007,6 +3094,7 @@ CONFIG_INPUT_PCAP=m
1163 CONFIG_INPUT_ADXL34X=m
1164 CONFIG_INPUT_ADXL34X_I2C=m
1165 CONFIG_INPUT_ADXL34X_SPI=m
1166 +CONFIG_INPUT_IMS_PCU=m
1167 CONFIG_INPUT_CMA3000=m
1168 CONFIG_INPUT_CMA3000_I2C=m
1169 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
1170 @@ -3034,6 +3122,7 @@ CONFIG_GAMEPORT_FM801=m
1171 #
1172 # Character devices
1173 #
1174 +CONFIG_TTY=y
1175 CONFIG_VT=y
1176 CONFIG_CONSOLE_TRANSLATIONS=y
1177 CONFIG_VT_CONSOLE=y
1178 @@ -3064,15 +3153,16 @@ CONFIG_TRACE_SINK=m
1179 # KCopy
1180 #
1181 CONFIG_KCOPY=m
1182 -CONFIG_STALDRV=y
1183
1184 #
1185 # Serial drivers
1186 #
1187 CONFIG_SERIAL_8250=y
1188 +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
1189 CONFIG_SERIAL_8250_PNP=y
1190 CONFIG_SERIAL_8250_CONSOLE=y
1191 CONFIG_FIX_EARLYCON_MEM=y
1192 +CONFIG_SERIAL_8250_DMA=y
1193 CONFIG_SERIAL_8250_PCI=y
1194 CONFIG_SERIAL_8250_CS=m
1195 CONFIG_SERIAL_8250_NR_UARTS=48
1196 @@ -3082,11 +3172,11 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
1197 CONFIG_SERIAL_8250_SHARE_IRQ=y
1198 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
1199 CONFIG_SERIAL_8250_RSA=y
1200 +CONFIG_SERIAL_8250_DW=m
1201
1202 #
1203 # Non-8250 serial port support
1204 #
1205 -CONFIG_SERIAL_KGDB_NMI=y
1206 CONFIG_SERIAL_MAX3100=m
1207 CONFIG_SERIAL_MAX310X=y
1208 CONFIG_SERIAL_MRST_MAX3110=m
1209 @@ -3094,7 +3184,6 @@ CONFIG_SERIAL_MFD_HSU=m
1210 CONFIG_SERIAL_UARTLITE=m
1211 CONFIG_SERIAL_CORE=y
1212 CONFIG_SERIAL_CORE_CONSOLE=y
1213 -CONFIG_CONSOLE_POLL=y
1214 CONFIG_SERIAL_JSM=m
1215 CONFIG_SERIAL_SCCNXP=y
1216 CONFIG_SERIAL_SCCNXP_CONSOLE=y
1217 @@ -3107,6 +3196,9 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
1218 CONFIG_SERIAL_PCH_UART=m
1219 CONFIG_SERIAL_ARC=m
1220 CONFIG_SERIAL_ARC_NR_PORTS=1
1221 +CONFIG_SERIAL_RP2=m
1222 +CONFIG_SERIAL_RP2_NR_UARTS=32
1223 +CONFIG_SERIAL_FSL_LPUART=m
1224 CONFIG_TTY_PRINTK=y
1225 CONFIG_PRINTER=m
1226 # CONFIG_LP_CONSOLE is not set
1227 @@ -3126,8 +3218,10 @@ CONFIG_HW_RANDOM=y
1228 CONFIG_HW_RANDOM_TIMERIOMEM=m
1229 CONFIG_HW_RANDOM_INTEL=m
1230 CONFIG_HW_RANDOM_AMD=m
1231 +CONFIG_HW_RANDOM_ATMEL=m
1232 CONFIG_HW_RANDOM_VIA=m
1233 CONFIG_HW_RANDOM_VIRTIO=m
1234 +CONFIG_HW_RANDOM_EXYNOS=m
1235 CONFIG_HW_RANDOM_TPM=m
1236 CONFIG_NVRAM=m
1237 CONFIG_R3964=m
1238 @@ -3152,6 +3246,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m
1239 CONFIG_TCG_NSC=m
1240 CONFIG_TCG_ATMEL=m
1241 CONFIG_TCG_INFINEON=m
1242 +CONFIG_TCG_ST33_I2C=m
1243 CONFIG_TELCLOCK=m
1244 CONFIG_I2C=y
1245 CONFIG_I2C_BOARDINFO=y
1246 @@ -3185,6 +3280,7 @@ CONFIG_I2C_AMD756_S4882=m
1247 CONFIG_I2C_AMD8111=m
1248 CONFIG_I2C_I801=m
1249 CONFIG_I2C_ISCH=m
1250 +CONFIG_I2C_ISMT=m
1251 CONFIG_I2C_PIIX4=m
1252 CONFIG_I2C_NFORCE2=m
1253 CONFIG_I2C_NFORCE2_S4985=m
1254 @@ -3204,10 +3300,11 @@ CONFIG_I2C_SCMI=m
1255 #
1256 CONFIG_I2C_CBUS_GPIO=m
1257 CONFIG_I2C_DESIGNWARE_CORE=m
1258 +CONFIG_I2C_DESIGNWARE_PLATFORM=m
1259 CONFIG_I2C_DESIGNWARE_PCI=m
1260 CONFIG_I2C_EG20T=m
1261 CONFIG_I2C_GPIO=m
1262 -CONFIG_I2C_INTEL_MID=m
1263 +CONFIG_I2C_KEMPLD=m
1264 CONFIG_I2C_OCORES=m
1265 CONFIG_I2C_PCA_PLATFORM=m
1266 # CONFIG_I2C_PXA_PCI is not set
1267 @@ -3244,14 +3341,17 @@ CONFIG_SPI_BUTTERFLY=m
1268 CONFIG_SPI_GPIO=m
1269 CONFIG_SPI_LM70_LLP=m
1270 CONFIG_SPI_OC_TINY=m
1271 -# CONFIG_SPI_PXA2XX_PCI is not set
1272 +CONFIG_SPI_PXA2XX_DMA=y
1273 +CONFIG_SPI_PXA2XX=m
1274 +CONFIG_SPI_PXA2XX_PCI=m
1275 CONFIG_SPI_SC18IS602=m
1276 CONFIG_SPI_TOPCLIFF_PCH=m
1277 CONFIG_SPI_XCOMM=m
1278 -# CONFIG_SPI_XILINX is not set
1279 +CONFIG_SPI_XILINX=m
1280 CONFIG_SPI_DESIGNWARE=m
1281 CONFIG_SPI_DW_PCI=m
1282 CONFIG_SPI_DW_MID_DMA=y
1283 +CONFIG_SPI_DW_MMIO=m
1284
1285 #
1286 # SPI Protocol Masters
1287 @@ -3271,6 +3371,7 @@ CONFIG_HSI_CHAR=m
1288 #
1289 CONFIG_PPS=m
1290 # CONFIG_PPS_DEBUG is not set
1291 +# CONFIG_NTP_PPS is not set
1292
1293 #
1294 # PPS clients support
1295 @@ -3294,6 +3395,7 @@ CONFIG_PTP_1588_CLOCK=m
1296 #
1297 CONFIG_PTP_1588_CLOCK_PCH=m
1298 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1299 +CONFIG_GPIO_DEVRES=y
1300 CONFIG_GPIOLIB=y
1301 CONFIG_GPIO_ACPI=y
1302 # CONFIG_DEBUG_GPIO is not set
1303 @@ -3312,6 +3414,7 @@ CONFIG_GPIO_TS5500=m
1304 CONFIG_GPIO_SCH=m
1305 CONFIG_GPIO_ICH=m
1306 CONFIG_GPIO_VX855=m
1307 +CONFIG_GPIO_LYNXPOINT=y
1308
1309 #
1310 # I2C GPIO expanders:
1311 @@ -3326,7 +3429,6 @@ CONFIG_GPIO_SX150X=y
1312 CONFIG_GPIO_STMPE=y
1313 CONFIG_GPIO_TC3589X=y
1314 CONFIG_GPIO_TPS65912=m
1315 -CONFIG_GPIO_TWL4030=m
1316 CONFIG_GPIO_TWL6040=m
1317 CONFIG_GPIO_WM831X=m
1318 CONFIG_GPIO_WM8350=m
1319 @@ -3362,6 +3464,7 @@ CONFIG_GPIO_UCB1400=y
1320 # MODULbus GPIO expanders:
1321 #
1322 CONFIG_GPIO_JANZ_TTL=m
1323 +CONFIG_GPIO_PALMAS=y
1324 CONFIG_GPIO_TPS6586X=y
1325 CONFIG_GPIO_TPS65910=y
1326
1327 @@ -3387,6 +3490,8 @@ CONFIG_W1_MASTER_GPIO=m
1328 CONFIG_W1_SLAVE_THERM=m
1329 CONFIG_W1_SLAVE_SMEM=m
1330 CONFIG_W1_SLAVE_DS2408=m
1331 +CONFIG_W1_SLAVE_DS2408_READBACK=y
1332 +CONFIG_W1_SLAVE_DS2413=m
1333 CONFIG_W1_SLAVE_DS2423=m
1334 CONFIG_W1_SLAVE_DS2431=m
1335 CONFIG_W1_SLAVE_DS2433=m
1336 @@ -3420,10 +3525,8 @@ CONFIG_BATTERY_MAX17040=m
1337 CONFIG_BATTERY_MAX17042=m
1338 CONFIG_CHARGER_88PM860X=m
1339 CONFIG_CHARGER_PCF50633=m
1340 -CONFIG_BATTERY_RX51=m
1341 CONFIG_CHARGER_ISP1704=m
1342 CONFIG_CHARGER_MAX8903=m
1343 -CONFIG_CHARGER_TWL4030=m
1344 CONFIG_CHARGER_LP8727=m
1345 CONFIG_CHARGER_LP8788=m
1346 CONFIG_CHARGER_GPIO=m
1347 @@ -3432,6 +3535,8 @@ CONFIG_CHARGER_MAX8997=m
1348 CONFIG_CHARGER_MAX8998=m
1349 CONFIG_CHARGER_BQ2415X=m
1350 CONFIG_CHARGER_SMB347=m
1351 +CONFIG_CHARGER_TPS65090=m
1352 +CONFIG_BATTERY_GOLDFISH=m
1353 CONFIG_POWER_RESET=y
1354 CONFIG_POWER_AVS=y
1355 CONFIG_HWMON=y
1356 @@ -3453,6 +3558,8 @@ CONFIG_SENSORS_ADM1026=m
1357 CONFIG_SENSORS_ADM1029=m
1358 CONFIG_SENSORS_ADM1031=m
1359 CONFIG_SENSORS_ADM9240=m
1360 +CONFIG_SENSORS_ADT7X10=m
1361 +CONFIG_SENSORS_ADT7310=m
1362 CONFIG_SENSORS_ADT7410=m
1363 CONFIG_SENSORS_ADT7411=m
1364 CONFIG_SENSORS_ADT7462=m
1365 @@ -3474,6 +3581,7 @@ CONFIG_SENSORS_F71882FG=m
1366 CONFIG_SENSORS_F75375S=m
1367 CONFIG_SENSORS_FSCHMD=m
1368 CONFIG_SENSORS_G760A=m
1369 +CONFIG_SENSORS_G762=m
1370 CONFIG_SENSORS_GL518SM=m
1371 CONFIG_SENSORS_GL520SM=m
1372 CONFIG_SENSORS_GPIO_FAN=m
1373 @@ -3481,6 +3589,7 @@ CONFIG_SENSORS_HIH6130=m
1374 CONFIG_SENSORS_CORETEMP=m
1375 CONFIG_SENSORS_IBMAEM=m
1376 CONFIG_SENSORS_IBMPEX=m
1377 +CONFIG_SENSORS_IIO_HWMON=m
1378 CONFIG_SENSORS_IT87=m
1379 CONFIG_SENSORS_JC42=m
1380 CONFIG_SENSORS_LINEAGE=m
1381 @@ -3501,6 +3610,7 @@ CONFIG_SENSORS_LTC4151=m
1382 CONFIG_SENSORS_LTC4215=m
1383 CONFIG_SENSORS_LTC4245=m
1384 CONFIG_SENSORS_LTC4261=m
1385 +CONFIG_SENSORS_LM95234=m
1386 CONFIG_SENSORS_LM95241=m
1387 CONFIG_SENSORS_LM95245=m
1388 CONFIG_SENSORS_MAX1111=m
1389 @@ -3511,7 +3621,9 @@ CONFIG_SENSORS_MAX197=m
1390 CONFIG_SENSORS_MAX6639=m
1391 CONFIG_SENSORS_MAX6642=m
1392 CONFIG_SENSORS_MAX6650=m
1393 +CONFIG_SENSORS_MAX6697=m
1394 CONFIG_SENSORS_MCP3021=m
1395 +CONFIG_SENSORS_NCT6775=m
1396 CONFIG_SENSORS_NTC_THERMISTOR=m
1397 CONFIG_SENSORS_PC87360=m
1398 CONFIG_SENSORS_PC87427=m
1399 @@ -3545,12 +3657,12 @@ CONFIG_SENSORS_ADS1015=m
1400 CONFIG_SENSORS_ADS7828=m
1401 CONFIG_SENSORS_ADS7871=m
1402 CONFIG_SENSORS_AMC6821=m
1403 +CONFIG_SENSORS_INA209=m
1404 CONFIG_SENSORS_INA2XX=m
1405 CONFIG_SENSORS_THMC50=m
1406 CONFIG_SENSORS_TMP102=m
1407 CONFIG_SENSORS_TMP401=m
1408 CONFIG_SENSORS_TMP421=m
1409 -CONFIG_SENSORS_TWL4030_MADC=m
1410 CONFIG_SENSORS_VIA_CPUTEMP=m
1411 CONFIG_SENSORS_VIA686A=m
1412 CONFIG_SENSORS_VT1211=m
1413 @@ -3580,10 +3692,17 @@ CONFIG_THERMAL_HWMON=y
1414 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
1415 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
1416 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
1417 -CONFIG_FAIR_SHARE=y
1418 -CONFIG_STEP_WISE=y
1419 -CONFIG_USER_SPACE=y
1420 +CONFIG_THERMAL_GOV_FAIR_SHARE=y
1421 +CONFIG_THERMAL_GOV_STEP_WISE=y
1422 +CONFIG_THERMAL_GOV_USER_SPACE=y
1423 CONFIG_CPU_THERMAL=y
1424 +CONFIG_THERMAL_EMULATION=y
1425 +CONFIG_INTEL_POWERCLAMP=m
1426 +CONFIG_X86_PKG_TEMP_THERMAL=m
1427 +
1428 +#
1429 +# Texas Instruments thermal drivers
1430 +#
1431 CONFIG_WATCHDOG=y
1432 CONFIG_WATCHDOG_CORE=y
1433 # CONFIG_WATCHDOG_NOWAYOUT is not set
1434 @@ -3596,13 +3715,14 @@ CONFIG_DA9052_WATCHDOG=m
1435 CONFIG_DA9055_WATCHDOG=m
1436 CONFIG_WM831X_WATCHDOG=m
1437 CONFIG_WM8350_WATCHDOG=m
1438 -CONFIG_TWL4030_WATCHDOG=m
1439 +CONFIG_RETU_WATCHDOG=m
1440 CONFIG_ACQUIRE_WDT=m
1441 CONFIG_ADVANTECH_WDT=m
1442 CONFIG_ALIM1535_WDT=m
1443 CONFIG_ALIM7101_WDT=m
1444 CONFIG_F71808E_WDT=m
1445 CONFIG_SP5100_TCO=m
1446 +CONFIG_GEODE_WDT=m
1447 CONFIG_SC520_WDT=m
1448 CONFIG_SBC_FITPC2_WATCHDOG=m
1449 CONFIG_EUROTECH_WDT=m
1450 @@ -3616,6 +3736,7 @@ CONFIG_ITCO_VENDOR_SUPPORT=y
1451 CONFIG_IT8712F_WDT=m
1452 CONFIG_IT87_WDT=m
1453 CONFIG_HP_WATCHDOG=m
1454 +CONFIG_KEMPLD_WDT=m
1455 CONFIG_HPWDT_NMI_DECODING=y
1456 CONFIG_SC1200_WDT=m
1457 CONFIG_PC87413_WDT=m
1458 @@ -3633,6 +3754,7 @@ CONFIG_W83877F_WDT=m
1459 CONFIG_W83977F_WDT=m
1460 CONFIG_MACHZ_WDT=m
1461 CONFIG_SBC_EPX_C3_WATCHDOG=m
1462 +CONFIG_MEN_A21_WDT=m
1463 CONFIG_XEN_WDT=m
1464
1465 #
1466 @@ -3682,20 +3804,70 @@ CONFIG_BCMA_DRIVER_GPIO=y
1467 # Multifunction device drivers
1468 #
1469 CONFIG_MFD_CORE=y
1470 -CONFIG_MFD_88PM860X=y
1471 +CONFIG_MFD_CS5535=m
1472 +CONFIG_MFD_AS3711=y
1473 +CONFIG_PMIC_ADP5520=y
1474 +CONFIG_MFD_AAT2870_CORE=y
1475 +CONFIG_MFD_CROS_EC=m
1476 +CONFIG_MFD_CROS_EC_I2C=m
1477 +CONFIG_MFD_CROS_EC_SPI=m
1478 +CONFIG_PMIC_DA903X=y
1479 +CONFIG_PMIC_DA9052=y
1480 +CONFIG_MFD_DA9052_SPI=y
1481 +CONFIG_MFD_DA9052_I2C=y
1482 +CONFIG_MFD_DA9055=y
1483 +CONFIG_MFD_MC13783=m
1484 +CONFIG_MFD_MC13XXX=m
1485 +CONFIG_MFD_MC13XXX_SPI=m
1486 +CONFIG_MFD_MC13XXX_I2C=m
1487 +CONFIG_HTC_PASIC3=m
1488 +CONFIG_HTC_I2CPLD=y
1489 +CONFIG_LPC_ICH=m
1490 +CONFIG_LPC_SCH=m
1491 +CONFIG_MFD_JANZ_CMODIO=m
1492 +CONFIG_MFD_KEMPLD=m
1493 CONFIG_MFD_88PM800=m
1494 CONFIG_MFD_88PM805=m
1495 +CONFIG_MFD_88PM860X=y
1496 +CONFIG_MFD_MAX77686=y
1497 +CONFIG_MFD_MAX77693=y
1498 +CONFIG_MFD_MAX8907=m
1499 +CONFIG_MFD_MAX8925=y
1500 +CONFIG_MFD_MAX8997=y
1501 +CONFIG_MFD_MAX8998=y
1502 +CONFIG_EZX_PCAP=y
1503 +CONFIG_MFD_VIPERBOARD=m
1504 +CONFIG_MFD_RETU=m
1505 +CONFIG_MFD_PCF50633=m
1506 +CONFIG_PCF50633_ADC=m
1507 +CONFIG_PCF50633_GPIO=m
1508 +CONFIG_UCB1400_CORE=m
1509 +CONFIG_MFD_RDC321X=m
1510 +CONFIG_MFD_RTSX_PCI=m
1511 +CONFIG_MFD_RC5T583=y
1512 +CONFIG_MFD_SEC_CORE=y
1513 +CONFIG_MFD_SI476X_CORE=m
1514 CONFIG_MFD_SM501=m
1515 # CONFIG_MFD_SM501_GPIO is not set
1516 -CONFIG_MFD_RTSX_PCI=m
1517 +CONFIG_MFD_SMSC=y
1518 +CONFIG_ABX500_CORE=y
1519 +CONFIG_AB3100_CORE=y
1520 +CONFIG_AB3100_OTP=m
1521 +CONFIG_MFD_STMPE=y
1522 +
1523 +#
1524 +# STMicroelectronics STMPE Interface Drivers
1525 +#
1526 +CONFIG_STMPE_I2C=y
1527 +CONFIG_STMPE_SPI=y
1528 +CONFIG_MFD_SYSCON=y
1529 CONFIG_MFD_TI_AM335X_TSCADC=m
1530 -CONFIG_HTC_PASIC3=m
1531 -CONFIG_HTC_I2CPLD=y
1532 -CONFIG_UCB1400_CORE=m
1533 -CONFIG_MFD_LM3533=m
1534 +CONFIG_MFD_LP8788=y
1535 +CONFIG_MFD_PALMAS=y
1536 CONFIG_TPS6105X=m
1537 CONFIG_TPS65010=m
1538 CONFIG_TPS6507X=m
1539 +CONFIG_MFD_TPS65090=y
1540 CONFIG_MFD_TPS65217=m
1541 CONFIG_MFD_TPS6586X=y
1542 CONFIG_MFD_TPS65910=y
1543 @@ -3703,39 +3875,20 @@ CONFIG_MFD_TPS65912=y
1544 CONFIG_MFD_TPS65912_I2C=y
1545 CONFIG_MFD_TPS65912_SPI=y
1546 CONFIG_MFD_TPS80031=y
1547 -CONFIG_TWL4030_CORE=y
1548 -CONFIG_TWL4030_MADC=m
1549 -CONFIG_MFD_TWL4030_AUDIO=y
1550 +# CONFIG_TWL4030_CORE is not set
1551 CONFIG_TWL6040_CORE=y
1552 -CONFIG_MFD_STMPE=y
1553 -
1554 -#
1555 -# STMPE Interface Drivers
1556 -#
1557 -CONFIG_STMPE_I2C=y
1558 -CONFIG_STMPE_SPI=y
1559 +CONFIG_MFD_WL1273_CORE=m
1560 +CONFIG_MFD_LM3533=m
1561 +CONFIG_MFD_TIMBERDALE=m
1562 CONFIG_MFD_TC3589X=y
1563 # CONFIG_MFD_TMIO is not set
1564 -CONFIG_MFD_SMSC=y
1565 -CONFIG_PMIC_DA903X=y
1566 -CONFIG_PMIC_DA9052=y
1567 -CONFIG_MFD_DA9052_SPI=y
1568 -CONFIG_MFD_DA9052_I2C=y
1569 -CONFIG_MFD_DA9055=y
1570 -CONFIG_PMIC_ADP5520=y
1571 -CONFIG_MFD_LP8788=y
1572 -CONFIG_MFD_MAX77686=y
1573 -CONFIG_MFD_MAX77693=y
1574 -CONFIG_MFD_MAX8907=m
1575 -CONFIG_MFD_MAX8925=y
1576 -CONFIG_MFD_MAX8997=y
1577 -CONFIG_MFD_MAX8998=y
1578 -CONFIG_MFD_SEC_CORE=y
1579 +CONFIG_MFD_VX855=m
1580 CONFIG_MFD_ARIZONA=y
1581 CONFIG_MFD_ARIZONA_I2C=m
1582 CONFIG_MFD_ARIZONA_SPI=m
1583 CONFIG_MFD_WM5102=y
1584 CONFIG_MFD_WM5110=y
1585 +CONFIG_MFD_WM8997=y
1586 CONFIG_MFD_WM8400=y
1587 CONFIG_MFD_WM831X=y
1588 CONFIG_MFD_WM831X_I2C=y
1589 @@ -3743,32 +3896,6 @@ CONFIG_MFD_WM831X_SPI=y
1590 CONFIG_MFD_WM8350=y
1591 CONFIG_MFD_WM8350_I2C=y
1592 CONFIG_MFD_WM8994=y
1593 -CONFIG_MFD_PCF50633=m
1594 -CONFIG_PCF50633_ADC=m
1595 -CONFIG_PCF50633_GPIO=m
1596 -CONFIG_MFD_MC13783=m
1597 -CONFIG_MFD_MC13XXX=m
1598 -CONFIG_MFD_MC13XXX_SPI=m
1599 -CONFIG_MFD_MC13XXX_I2C=m
1600 -CONFIG_ABX500_CORE=y
1601 -CONFIG_AB3100_CORE=y
1602 -CONFIG_AB3100_OTP=m
1603 -CONFIG_EZX_PCAP=y
1604 -CONFIG_MFD_CS5535=m
1605 -CONFIG_MFD_TIMBERDALE=m
1606 -CONFIG_LPC_SCH=m
1607 -CONFIG_LPC_ICH=m
1608 -CONFIG_MFD_RDC321X=m
1609 -CONFIG_MFD_JANZ_CMODIO=m
1610 -CONFIG_MFD_VX855=m
1611 -CONFIG_MFD_WL1273_CORE=m
1612 -CONFIG_MFD_TPS65090=y
1613 -CONFIG_MFD_AAT2870_CORE=y
1614 -CONFIG_MFD_RC5T583=y
1615 -CONFIG_MFD_PALMAS=y
1616 -CONFIG_MFD_VIPERBOARD=m
1617 -CONFIG_MFD_RETU=m
1618 -CONFIG_MFD_AS3711=y
1619 CONFIG_REGULATOR=y
1620 # CONFIG_REGULATOR_DEBUG is not set
1621 # CONFIG_REGULATOR_DUMMY is not set
1622 @@ -3783,6 +3910,7 @@ CONFIG_REGULATOR_DA903X=m
1623 CONFIG_REGULATOR_DA9052=m
1624 CONFIG_REGULATOR_DA9055=m
1625 CONFIG_REGULATOR_FAN53555=m
1626 +CONFIG_REGULATOR_ANATOP=m
1627 CONFIG_REGULATOR_MC13XXX_CORE=m
1628 CONFIG_REGULATOR_MC13783=m
1629 CONFIG_REGULATOR_MC13892=m
1630 @@ -3798,10 +3926,12 @@ CONFIG_REGULATOR_MAX8973=m
1631 CONFIG_REGULATOR_MAX8997=m
1632 CONFIG_REGULATOR_MAX8998=m
1633 CONFIG_REGULATOR_MAX77686=m
1634 +CONFIG_REGULATOR_MAX77693=m
1635 CONFIG_REGULATOR_PCAP=m
1636 CONFIG_REGULATOR_LP3971=m
1637 CONFIG_REGULATOR_LP3972=m
1638 CONFIG_REGULATOR_LP872X=y
1639 +CONFIG_REGULATOR_LP8755=m
1640 CONFIG_REGULATOR_LP8788=y
1641 CONFIG_REGULATOR_PCF50633=m
1642 CONFIG_REGULATOR_RC5T583=m
1643 @@ -3821,7 +3951,6 @@ CONFIG_REGULATOR_TPS6586X=m
1644 CONFIG_REGULATOR_TPS65910=m
1645 CONFIG_REGULATOR_TPS65912=m
1646 CONFIG_REGULATOR_TPS80031=m
1647 -CONFIG_REGULATOR_TWL4030=y
1648 CONFIG_REGULATOR_WM831X=m
1649 CONFIG_REGULATOR_WM8350=m
1650 CONFIG_REGULATOR_WM8400=m
1651 @@ -3853,8 +3982,11 @@ CONFIG_VIDEOBUF2_CORE=m
1652 CONFIG_VIDEOBUF2_MEMOPS=m
1653 CONFIG_VIDEOBUF2_DMA_CONTIG=m
1654 CONFIG_VIDEOBUF2_VMALLOC=m
1655 +CONFIG_VIDEOBUF2_DMA_SG=m
1656 +CONFIG_VIDEO_V4L2_INT_DEVICE=m
1657 CONFIG_DVB_CORE=m
1658 CONFIG_DVB_NET=y
1659 +CONFIG_TTPCI_EEPROM=m
1660 CONFIG_DVB_MAX_ADAPTERS=8
1661 CONFIG_DVB_DYNAMIC_MINORS=y
1662
1663 @@ -3951,11 +4083,11 @@ CONFIG_USB_ZR364XX=m
1664 CONFIG_USB_STKWEBCAM=m
1665 CONFIG_USB_S2255=m
1666 # CONFIG_USB_SN9C102 is not set
1667 +CONFIG_VIDEO_USBTV=m
1668
1669 #
1670 # Analog TV USB devices
1671 #
1672 -CONFIG_VIDEO_AU0828=m
1673 CONFIG_VIDEO_PVRUSB2=m
1674 CONFIG_VIDEO_PVRUSB2_SYSFS=y
1675 CONFIG_VIDEO_PVRUSB2_DVB=y
1676 @@ -3969,6 +4101,8 @@ CONFIG_VIDEO_STK1160_AC97=y
1677 #
1678 # Analog/digital TV USB devices
1679 #
1680 +CONFIG_VIDEO_AU0828=m
1681 +CONFIG_VIDEO_AU0828_V4L2=y
1682 CONFIG_VIDEO_CX231XX=m
1683 CONFIG_VIDEO_CX231XX_RC=y
1684 CONFIG_VIDEO_CX231XX_ALSA=m
1685 @@ -4008,7 +4142,6 @@ CONFIG_DVB_USB_FRIIO=m
1686 CONFIG_DVB_USB_AZ6027=m
1687 CONFIG_DVB_USB_TECHNISAT_USB2=m
1688 CONFIG_DVB_USB_V2=m
1689 -CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
1690 CONFIG_DVB_USB_AF9015=m
1691 CONFIG_DVB_USB_AF9035=m
1692 CONFIG_DVB_USB_ANYSEE=m
1693 @@ -4085,7 +4218,6 @@ CONFIG_VIDEO_SAA7164=m
1694 #
1695 # Media digital TV PCI Adapters
1696 #
1697 -CONFIG_TTPCI_EEPROM=m
1698 CONFIG_DVB_AV7110=m
1699 CONFIG_DVB_AV7110_OSD=y
1700 CONFIG_DVB_BUDGET_CORE=m
1701 @@ -4108,9 +4240,13 @@ CONFIG_VIDEO_CAFE_CCIC=m
1702 CONFIG_VIDEO_VIA_CAMERA=m
1703 CONFIG_VIDEO_TIMBERDALE=m
1704 CONFIG_SOC_CAMERA=m
1705 +CONFIG_SOC_CAMERA_SCALE_CROP=m
1706 CONFIG_SOC_CAMERA_PLATFORM=m
1707 +CONFIG_VIDEO_SH_MOBILE_CSI2=m
1708 +CONFIG_VIDEO_SH_MOBILE_CEU=m
1709 CONFIG_V4L_MEM2MEM_DRIVERS=y
1710 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
1711 +CONFIG_VIDEO_SH_VEU=m
1712 CONFIG_V4L_TEST_DRIVERS=y
1713 CONFIG_VIDEO_VIVI=m
1714 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
1715 @@ -4127,6 +4263,7 @@ CONFIG_RADIO_ADAPTERS=y
1716 CONFIG_RADIO_SI470X=y
1717 CONFIG_USB_SI470X=m
1718 CONFIG_I2C_SI470X=m
1719 +CONFIG_RADIO_SI476X=m
1720 CONFIG_USB_MR800=m
1721 CONFIG_USB_DSBR=m
1722 CONFIG_RADIO_MAXIRADIO=m
1723 @@ -4135,6 +4272,7 @@ CONFIG_RADIO_SHARK2=m
1724 CONFIG_I2C_SI4713=m
1725 CONFIG_RADIO_SI4713=m
1726 CONFIG_USB_KEENE=m
1727 +CONFIG_USB_MA901=m
1728 CONFIG_RADIO_TEA5764=m
1729 CONFIG_RADIO_SAA7706H=m
1730 CONFIG_RADIO_TEF6862=m
1731 @@ -4156,18 +4294,22 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
1732 #
1733 # common driver options
1734 #
1735 +CONFIG_VIDEO_CX2341X=m
1736 +CONFIG_VIDEO_BTCX=m
1737 +CONFIG_VIDEO_TVEEPROM=m
1738 +CONFIG_CYPRESS_FIRMWARE=m
1739 CONFIG_DVB_B2C2_FLEXCOP=m
1740 CONFIG_VIDEO_SAA7146=m
1741 CONFIG_VIDEO_SAA7146_VV=m
1742 CONFIG_SMS_SIANO_MDTV=m
1743 CONFIG_SMS_SIANO_RC=y
1744 -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
1745 +CONFIG_SMS_SIANO_DEBUGFS=y
1746
1747 #
1748 # Media ancillary drivers (tuners, sensors, i2c, frontends)
1749 #
1750 -CONFIG_VIDEO_BTCX=m
1751 -CONFIG_VIDEO_TVEEPROM=m
1752 +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
1753 +CONFIG_MEDIA_ATTACH=y
1754 CONFIG_VIDEO_IR_I2C=m
1755
1756 #
1757 @@ -4181,9 +4323,11 @@ CONFIG_VIDEO_TEA6420=m
1758 CONFIG_VIDEO_MSP3400=m
1759 CONFIG_VIDEO_CS5345=m
1760 CONFIG_VIDEO_CS53L32A=m
1761 +CONFIG_VIDEO_UDA1342=m
1762 CONFIG_VIDEO_WM8775=m
1763 CONFIG_VIDEO_WM8739=m
1764 CONFIG_VIDEO_VP27SMPX=m
1765 +CONFIG_VIDEO_SONY_BTF_MPX=m
1766
1767 #
1768 # RDS decoders
1769 @@ -4201,6 +4345,9 @@ CONFIG_VIDEO_KS0127=m
1770 CONFIG_VIDEO_SAA7110=m
1771 CONFIG_VIDEO_SAA711X=m
1772 CONFIG_VIDEO_TVP5150=m
1773 +CONFIG_VIDEO_TW2804=m
1774 +CONFIG_VIDEO_TW9903=m
1775 +CONFIG_VIDEO_TW9906=m
1776 CONFIG_VIDEO_VPX3220=m
1777
1778 #
1779 @@ -4210,11 +4357,6 @@ CONFIG_VIDEO_SAA717X=m
1780 CONFIG_VIDEO_CX25840=m
1781
1782 #
1783 -# MPEG video encoders
1784 -#
1785 -CONFIG_VIDEO_CX2341X=m
1786 -
1787 -#
1788 # Video encoders
1789 #
1790 CONFIG_VIDEO_SAA7127=m
1791 @@ -4225,6 +4367,7 @@ CONFIG_VIDEO_ADV7175=m
1792 #
1793 # Camera sensor devices
1794 #
1795 +CONFIG_VIDEO_OV7640=m
1796 CONFIG_VIDEO_OV7670=m
1797 CONFIG_VIDEO_MT9V011=m
1798
1799 @@ -4264,7 +4407,6 @@ CONFIG_SOC_CAMERA_OV9640=m
1800 CONFIG_SOC_CAMERA_OV9740=m
1801 CONFIG_SOC_CAMERA_RJ54N1=m
1802 CONFIG_SOC_CAMERA_TW9910=m
1803 -CONFIG_MEDIA_ATTACH=y
1804 CONFIG_MEDIA_TUNER=m
1805 CONFIG_MEDIA_TUNER_SIMPLE=m
1806 CONFIG_MEDIA_TUNER_TDA8290=m
1807 @@ -4294,6 +4436,8 @@ CONFIG_MEDIA_TUNER_TDA18212=m
1808 CONFIG_MEDIA_TUNER_E4000=m
1809 CONFIG_MEDIA_TUNER_FC2580=m
1810 CONFIG_MEDIA_TUNER_TUA9001=m
1811 +CONFIG_MEDIA_TUNER_IT913X=m
1812 +CONFIG_MEDIA_TUNER_R820T=m
1813
1814 #
1815 # Multistandard (satellite) frontends
1816 @@ -4333,6 +4477,7 @@ CONFIG_DVB_TDA826X=m
1817 CONFIG_DVB_TUA6100=m
1818 CONFIG_DVB_CX24116=m
1819 CONFIG_DVB_SI21XX=m
1820 +CONFIG_DVB_TS2020=m
1821 CONFIG_DVB_DS3000=m
1822 CONFIG_DVB_MB86A16=m
1823 CONFIG_DVB_TDA10071=m
1824 @@ -4438,20 +4583,21 @@ CONFIG_DRM_USB=m
1825 CONFIG_DRM_KMS_HELPER=m
1826 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
1827 CONFIG_DRM_TTM=m
1828 +
1829 +#
1830 +# I2C encoder or helper chips
1831 +#
1832 +CONFIG_DRM_I2C_CH7006=m
1833 +CONFIG_DRM_I2C_SIL164=m
1834 +CONFIG_DRM_I2C_NXP_TDA998X=m
1835 CONFIG_DRM_TDFX=m
1836 CONFIG_DRM_R128=m
1837 CONFIG_DRM_RADEON=m
1838 -CONFIG_DRM_RADEON_KMS=y
1839 +CONFIG_DRM_RADEON_UMS=y
1840 CONFIG_DRM_NOUVEAU=m
1841 CONFIG_NOUVEAU_DEBUG=5
1842 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
1843 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
1844 -
1845 -#
1846 -# I2C encoder or helper chips
1847 -#
1848 -CONFIG_DRM_I2C_CH7006=m
1849 -CONFIG_DRM_I2C_SIL164=m
1850 CONFIG_DRM_I810=m
1851 CONFIG_DRM_I915=m
1852 CONFIG_DRM_I915_KMS=y
1853 @@ -4466,11 +4612,12 @@ CONFIG_DRM_GMA600=y
1854 CONFIG_DRM_GMA3600=y
1855 CONFIG_DRM_UDL=m
1856 CONFIG_DRM_AST=m
1857 -# CONFIG_DRM_MGAG200 is not set
1858 +CONFIG_DRM_MGAG200=m
1859 CONFIG_DRM_CIRRUS_QEMU=m
1860 -# CONFIG_STUB_POULSBO is not set
1861 +CONFIG_DRM_QXL=m
1862 CONFIG_VGASTATE=m
1863 CONFIG_VIDEO_OUTPUT_CONTROL=m
1864 +CONFIG_HDMI=y
1865 CONFIG_FB=y
1866 CONFIG_FIRMWARE_EDID=y
1867 CONFIG_FB_DDC=m
1868 @@ -4484,7 +4631,6 @@ CONFIG_FB_SYS_COPYAREA=m
1869 CONFIG_FB_SYS_IMAGEBLIT=m
1870 # CONFIG_FB_FOREIGN_ENDIAN is not set
1871 CONFIG_FB_SYS_FOPS=m
1872 -# CONFIG_FB_WMT_GE_ROPS is not set
1873 CONFIG_FB_DEFERRED_IO=y
1874 CONFIG_FB_HECUBA=m
1875 CONFIG_FB_SVGALIB=m
1876 @@ -4566,15 +4712,12 @@ CONFIG_FB_PM3=m
1877 CONFIG_FB_CARMINE=m
1878 CONFIG_FB_CARMINE_DRAM_EVAL=y
1879 # CONFIG_CARMINE_DRAM_CUSTOM is not set
1880 -CONFIG_FB_GEODE=y
1881 -CONFIG_FB_GEODE_LX=m
1882 -CONFIG_FB_GEODE_GX=m
1883 -CONFIG_FB_GEODE_GX1=m
1884 CONFIG_FB_TMIO=m
1885 CONFIG_FB_TMIO_ACCELL=y
1886 CONFIG_FB_SM501=m
1887 CONFIG_FB_SMSCUFX=m
1888 CONFIG_FB_UDL=m
1889 +CONFIG_FB_GOLDFISH=m
1890 # CONFIG_FB_VIRTUAL is not set
1891 CONFIG_XEN_FBDEV_FRONTEND=m
1892 CONFIG_FB_METRONOME=m
1893 @@ -4585,12 +4728,14 @@ CONFIG_FB_BROADSHEET=m
1894 CONFIG_FB_AUO_K190X=m
1895 CONFIG_FB_AUO_K1900=m
1896 CONFIG_FB_AUO_K1901=m
1897 +CONFIG_FB_HYPERV=m
1898 CONFIG_EXYNOS_VIDEO=y
1899 CONFIG_BACKLIGHT_LCD_SUPPORT=y
1900 CONFIG_LCD_CLASS_DEVICE=m
1901 CONFIG_LCD_L4F00242T03=m
1902 CONFIG_LCD_LMS283GF05=m
1903 CONFIG_LCD_LTV350QV=m
1904 +CONFIG_LCD_ILI922X=m
1905 CONFIG_LCD_ILI9320=m
1906 CONFIG_LCD_TDO24M=m
1907 CONFIG_LCD_VGG2432A4=m
1908 @@ -4598,7 +4743,10 @@ CONFIG_LCD_PLATFORM=m
1909 CONFIG_LCD_S6E63M0=m
1910 CONFIG_LCD_LD9040=m
1911 CONFIG_LCD_AMS369FG06=m
1912 +CONFIG_LCD_LMS501KF03=m
1913 +CONFIG_LCD_HX8357=m
1914 CONFIG_BACKLIGHT_CLASS_DEVICE=y
1915 +CONFIG_BACKLIGHT_ATMEL_PWM=m
1916 CONFIG_BACKLIGHT_GENERIC=m
1917 CONFIG_BACKLIGHT_LM3533=m
1918 CONFIG_BACKLIGHT_CARILLO_RANCH=m
1919 @@ -4618,8 +4766,10 @@ CONFIG_BACKLIGHT_AAT2870=m
1920 CONFIG_BACKLIGHT_LM3630=m
1921 CONFIG_BACKLIGHT_LM3639=m
1922 CONFIG_BACKLIGHT_LP855X=m
1923 -CONFIG_BACKLIGHT_PANDORA=m
1924 +CONFIG_BACKLIGHT_LP8788=m
1925 +CONFIG_BACKLIGHT_OT200=m
1926 CONFIG_BACKLIGHT_TPS65217=m
1927 +CONFIG_BACKLIGHT_AS3711=m
1928
1929 #
1930 # Console display driver support
1931 @@ -4630,12 +4780,10 @@ CONFIG_DUMMY_CONSOLE=y
1932 CONFIG_FRAMEBUFFER_CONSOLE=y
1933 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
1934 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1935 -# CONFIG_FONTS is not set
1936 -CONFIG_FONT_8x8=y
1937 -CONFIG_FONT_8x16=y
1938 # CONFIG_LOGO is not set
1939 CONFIG_SOUND=m
1940 -# CONFIG_SOUND_OSS_CORE is not set
1941 +CONFIG_SOUND_OSS_CORE=y
1942 +CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1943 CONFIG_SND=m
1944 CONFIG_SND_TIMER=m
1945 CONFIG_SND_PCM=m
1946 @@ -4645,16 +4793,21 @@ CONFIG_SND_COMPRESS_OFFLOAD=m
1947 CONFIG_SND_JACK=y
1948 CONFIG_SND_SEQUENCER=m
1949 CONFIG_SND_SEQ_DUMMY=m
1950 -# CONFIG_SND_MIXER_OSS is not set
1951 -# CONFIG_SND_PCM_OSS is not set
1952 -# CONFIG_SND_SEQUENCER_OSS is not set
1953 +CONFIG_SND_OSSEMUL=y
1954 +CONFIG_SND_MIXER_OSS=m
1955 +CONFIG_SND_PCM_OSS=m
1956 +CONFIG_SND_PCM_OSS_PLUGINS=y
1957 +CONFIG_SND_SEQUENCER_OSS=y
1958 CONFIG_SND_HRTIMER=m
1959 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
1960 CONFIG_SND_DYNAMIC_MINORS=y
1961 +CONFIG_SND_MAX_CARDS=32
1962 CONFIG_SND_SUPPORT_OLD_API=y
1963 CONFIG_SND_VERBOSE_PROCFS=y
1964 # CONFIG_SND_VERBOSE_PRINTK is not set
1965 -# CONFIG_SND_DEBUG is not set
1966 +CONFIG_SND_DEBUG=y
1967 +# CONFIG_SND_DEBUG_VERBOSE is not set
1968 +CONFIG_SND_PCM_XRUN_DEBUG=y
1969 CONFIG_SND_VMASTER=y
1970 CONFIG_SND_KCTL_JACK=y
1971 CONFIG_SND_DMA_SGBUF=y
1972 @@ -4696,7 +4849,7 @@ CONFIG_SND_AU8830=m
1973 CONFIG_SND_AW2=m
1974 CONFIG_SND_AZT3328=m
1975 CONFIG_SND_BT87X=m
1976 -CONFIG_SND_BT87X_OVERCLOCK=y
1977 +# CONFIG_SND_BT87X_OVERCLOCK is not set
1978 CONFIG_SND_CA0106=m
1979 CONFIG_SND_CMIPCI=m
1980 CONFIG_SND_OXYGEN_LIB=m
1981 @@ -4732,6 +4885,7 @@ CONFIG_SND_ES1968_RADIO=y
1982 CONFIG_SND_FM801=m
1983 CONFIG_SND_FM801_TEA575X_BOOL=y
1984 CONFIG_SND_HDA_INTEL=m
1985 +CONFIG_SND_HDA_DSP_LOADER=y
1986 CONFIG_SND_HDA_PREALLOC_SIZE=64
1987 CONFIG_SND_HDA_HWDEP=y
1988 CONFIG_SND_HDA_RECONFIG=y
1989 @@ -4744,10 +4898,12 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
1990 CONFIG_SND_HDA_CODEC_SIGMATEL=y
1991 CONFIG_SND_HDA_CODEC_VIA=y
1992 CONFIG_SND_HDA_CODEC_HDMI=y
1993 +CONFIG_SND_HDA_I915=y
1994 CONFIG_SND_HDA_CODEC_CIRRUS=y
1995 CONFIG_SND_HDA_CODEC_CONEXANT=y
1996 CONFIG_SND_HDA_CODEC_CA0110=y
1997 CONFIG_SND_HDA_CODEC_CA0132=y
1998 +CONFIG_SND_HDA_CODEC_CA0132_DSP=y
1999 CONFIG_SND_HDA_CODEC_CMEDIA=y
2000 CONFIG_SND_HDA_CODEC_SI3054=y
2001 CONFIG_SND_HDA_GENERIC=y
2002 @@ -4778,6 +4934,8 @@ CONFIG_SND_VIRTUOSO=m
2003 CONFIG_SND_VX222=m
2004 CONFIG_SND_YMFPCI=m
2005 CONFIG_SND_SPI=y
2006 +CONFIG_SND_AT73C213=m
2007 +CONFIG_SND_AT73C213_TARGET_BITRATE=48000
2008 CONFIG_SND_USB=y
2009 CONFIG_SND_USB_AUDIO=m
2010 CONFIG_SND_USB_UA101=m
2011 @@ -4786,6 +4944,7 @@ CONFIG_SND_USB_CAIAQ=m
2012 CONFIG_SND_USB_CAIAQ_INPUT=y
2013 CONFIG_SND_USB_US122L=m
2014 CONFIG_SND_USB_6FIRE=m
2015 +CONFIG_SND_USB_HIFACE=m
2016 CONFIG_SND_FIREWIRE=y
2017 CONFIG_SND_FIREWIRE_LIB=m
2018 CONFIG_SND_FIREWIRE_SPEAKERS=m
2019 @@ -4795,6 +4954,8 @@ CONFIG_SND_PCMCIA=y
2020 CONFIG_SND_VXPOCKET=m
2021 CONFIG_SND_PDAUDIOCF=m
2022 CONFIG_SND_SOC=m
2023 +CONFIG_SND_ATMEL_SOC=m
2024 +CONFIG_SND_DESIGNWARE_I2S=m
2025 CONFIG_SND_SOC_I2C_AND_SPI=m
2026 CONFIG_SND_SOC_ALL_CODECS=m
2027 CONFIG_SND_SOC_88PM860X=m
2028 @@ -4813,6 +4974,7 @@ CONFIG_SND_SOC_AK4535=m
2029 CONFIG_SND_SOC_AK4641=m
2030 CONFIG_SND_SOC_AK4642=m
2031 CONFIG_SND_SOC_AK4671=m
2032 +CONFIG_SND_SOC_AK5386=m
2033 CONFIG_SND_SOC_ALC5623=m
2034 CONFIG_SND_SOC_ALC5632=m
2035 CONFIG_SND_SOC_CS42L51=m
2036 @@ -4824,28 +4986,33 @@ CONFIG_SND_SOC_CX20442=m
2037 CONFIG_SND_SOC_JZ4740_CODEC=m
2038 CONFIG_SND_SOC_L3=m
2039 CONFIG_SND_SOC_DA7210=m
2040 +CONFIG_SND_SOC_DA7213=m
2041 CONFIG_SND_SOC_DA732X=m
2042 CONFIG_SND_SOC_DA9055=m
2043 -CONFIG_SND_SOC_DFBMCS320=m
2044 +CONFIG_SND_SOC_BT_SCO=m
2045 CONFIG_SND_SOC_ISABELLE=m
2046 CONFIG_SND_SOC_LM49453=m
2047 CONFIG_SND_SOC_MAX98088=m
2048 CONFIG_SND_SOC_MAX98090=m
2049 CONFIG_SND_SOC_MAX98095=m
2050 CONFIG_SND_SOC_MAX9850=m
2051 +CONFIG_SND_SOC_HDMI_CODEC=m
2052 CONFIG_SND_SOC_PCM3008=m
2053 CONFIG_SND_SOC_RT5631=m
2054 +CONFIG_SND_SOC_RT5640=m
2055 CONFIG_SND_SOC_SGTL5000=m
2056 +CONFIG_SND_SOC_SI476X=m
2057 CONFIG_SND_SOC_SPDIF=m
2058 +CONFIG_SND_SOC_SSM2518=m
2059 CONFIG_SND_SOC_SSM2602=m
2060 CONFIG_SND_SOC_STA32X=m
2061 CONFIG_SND_SOC_STA529=m
2062 +CONFIG_SND_SOC_TAS5086=m
2063 CONFIG_SND_SOC_TLV320AIC23=m
2064 CONFIG_SND_SOC_TLV320AIC26=m
2065 CONFIG_SND_SOC_TLV320AIC32X4=m
2066 CONFIG_SND_SOC_TLV320AIC3X=m
2067 CONFIG_SND_SOC_TLV320DAC33=m
2068 -CONFIG_SND_SOC_TWL4030=m
2069 CONFIG_SND_SOC_TWL6040=m
2070 CONFIG_SND_SOC_UDA134X=m
2071 CONFIG_SND_SOC_UDA1380=m
2072 @@ -4921,6 +5088,7 @@ CONFIG_HID_A4TECH=m
2073 CONFIG_HID_ACRUX=m
2074 CONFIG_HID_ACRUX_FF=y
2075 CONFIG_HID_APPLE=m
2076 +CONFIG_HID_APPLEIR=m
2077 CONFIG_HID_AUREAL=m
2078 CONFIG_HID_BELKIN=m
2079 CONFIG_HID_CHERRY=m
2080 @@ -4931,9 +5099,11 @@ CONFIG_HID_DRAGONRISE=m
2081 CONFIG_DRAGONRISE_FF=y
2082 CONFIG_HID_EMS_FF=m
2083 CONFIG_HID_ELECOM=m
2084 +CONFIG_HID_ELO=m
2085 CONFIG_HID_EZKEY=m
2086 CONFIG_HID_HOLTEK=m
2087 CONFIG_HOLTEK_FF=y
2088 +CONFIG_HID_HUION=m
2089 CONFIG_HID_KEYTOUCH=m
2090 CONFIG_HID_KYE=m
2091 CONFIG_HID_UCLOGIC=m
2092 @@ -4966,12 +5136,12 @@ CONFIG_HID_PICOLCD_LCD=y
2093 CONFIG_HID_PICOLCD_LEDS=y
2094 CONFIG_HID_PICOLCD_CIR=y
2095 CONFIG_HID_PRIMAX=m
2096 -CONFIG_HID_PS3REMOTE=m
2097 CONFIG_HID_ROCCAT=m
2098 CONFIG_HID_SAITEK=m
2099 CONFIG_HID_SAMSUNG=m
2100 CONFIG_HID_SONY=m
2101 CONFIG_HID_SPEEDLINK=m
2102 +CONFIG_HID_STEELSERIES=m
2103 CONFIG_HID_SUNPLUS=m
2104 CONFIG_HID_GREENASIA=m
2105 CONFIG_GREENASIA_FF=y
2106 @@ -4980,11 +5150,11 @@ CONFIG_HID_SMARTJOYPLUS=m
2107 CONFIG_SMARTJOYPLUS_FF=y
2108 CONFIG_HID_TIVO=m
2109 CONFIG_HID_TOPSEED=m
2110 +CONFIG_HID_THINGM=m
2111 CONFIG_HID_THRUSTMASTER=m
2112 CONFIG_THRUSTMASTER_FF=y
2113 CONFIG_HID_WACOM=m
2114 CONFIG_HID_WIIMOTE=m
2115 -CONFIG_HID_WIIMOTE_EXT=y
2116 CONFIG_HID_ZEROPLUS=m
2117 CONFIG_ZEROPLUS_FF=y
2118 CONFIG_HID_ZYDACRON=m
2119 @@ -5007,9 +5177,6 @@ CONFIG_USB_MOUSE=m
2120 # I2C HID support
2121 #
2122 CONFIG_I2C_HID=m
2123 -CONFIG_USB_ARCH_HAS_OHCI=y
2124 -CONFIG_USB_ARCH_HAS_EHCI=y
2125 -CONFIG_USB_ARCH_HAS_XHCI=y
2126 CONFIG_USB_SUPPORT=y
2127 CONFIG_USB_COMMON=y
2128 CONFIG_USB_ARCH_HAS_HCD=y
2129 @@ -5020,13 +5187,11 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
2130 #
2131 # Miscellaneous USB options
2132 #
2133 +CONFIG_USB_DEFAULT_PERSIST=y
2134 CONFIG_USB_DYNAMIC_MINORS=y
2135 -CONFIG_USB_SUSPEND=y
2136 -# CONFIG_USB_OTG is not set
2137 +CONFIG_USB_OTG=y
2138 # CONFIG_USB_OTG_WHITELIST is not set
2139 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
2140 -CONFIG_USB_DWC3=m
2141 -# CONFIG_USB_DWC3_DEBUG is not set
2142 CONFIG_USB_MON=m
2143 CONFIG_USB_WUSB=m
2144 CONFIG_USB_WUSB_CBAF=m
2145 @@ -5043,13 +5208,15 @@ CONFIG_USB_EHCI_HCD=y
2146 CONFIG_USB_EHCI_ROOT_HUB_TT=y
2147 CONFIG_USB_EHCI_TT_NEWSCHED=y
2148 CONFIG_USB_EHCI_PCI=y
2149 +CONFIG_USB_EHCI_HCD_PLATFORM=y
2150 CONFIG_USB_OXU210HP_HCD=m
2151 CONFIG_USB_ISP116X_HCD=m
2152 CONFIG_USB_ISP1760_HCD=m
2153 CONFIG_USB_ISP1362_HCD=m
2154 +CONFIG_USB_FUSBH200_HCD=m
2155 CONFIG_USB_OHCI_HCD=y
2156 +CONFIG_USB_OHCI_HCD_PCI=m
2157 CONFIG_USB_OHCI_HCD_PLATFORM=y
2158 -CONFIG_USB_EHCI_HCD_PLATFORM=y
2159 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
2160 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
2161 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
2162 @@ -5065,12 +5232,14 @@ CONFIG_USB_HWA_HCD=m
2163 CONFIG_USB_HCD_BCMA=m
2164 CONFIG_USB_HCD_SSB=m
2165 CONFIG_USB_MUSB_HDRC=m
2166 +# CONFIG_USB_MUSB_HOST is not set
2167 +# CONFIG_USB_MUSB_GADGET is not set
2168 +CONFIG_USB_MUSB_DUAL_ROLE=y
2169 CONFIG_USB_MUSB_TUSB6010=m
2170 +CONFIG_USB_MUSB_DSPS=m
2171 +CONFIG_USB_MUSB_UX500=m
2172 +# CONFIG_USB_UX500_DMA is not set
2173 CONFIG_MUSB_PIO_ONLY=y
2174 -CONFIG_USB_CHIPIDEA=m
2175 -CONFIG_USB_CHIPIDEA_UDC=y
2176 -CONFIG_USB_CHIPIDEA_HOST=y
2177 -# CONFIG_USB_CHIPIDEA_DEBUG is not set
2178 CONFIG_USB_RENESAS_USBHS=m
2179
2180 #
2181 @@ -5110,6 +5279,15 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
2182 #
2183 CONFIG_USB_MDC800=m
2184 CONFIG_USB_MICROTEK=m
2185 +CONFIG_USB_DWC3=m
2186 +# CONFIG_USB_DWC3_HOST is not set
2187 +# CONFIG_USB_DWC3_GADGET is not set
2188 +CONFIG_USB_DWC3_DUAL_ROLE=y
2189 +# CONFIG_USB_DWC3_DEBUG is not set
2190 +CONFIG_USB_CHIPIDEA=m
2191 +CONFIG_USB_CHIPIDEA_UDC=y
2192 +CONFIG_USB_CHIPIDEA_HOST=y
2193 +# CONFIG_USB_CHIPIDEA_DEBUG is not set
2194
2195 #
2196 # USB port drivers
2197 @@ -5179,10 +5357,14 @@ CONFIG_USB_SERIAL_OPTION=m
2198 CONFIG_USB_SERIAL_OMNINET=m
2199 CONFIG_USB_SERIAL_OPTICON=m
2200 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
2201 +CONFIG_USB_SERIAL_XSENS_MT=m
2202 CONFIG_USB_SERIAL_ZIO=m
2203 +CONFIG_USB_SERIAL_WISHBONE=m
2204 CONFIG_USB_SERIAL_ZTE=m
2205 CONFIG_USB_SERIAL_SSU100=m
2206 CONFIG_USB_SERIAL_QT2=m
2207 +CONFIG_USB_SERIAL_FLASHLOADER=m
2208 +CONFIG_USB_SERIAL_SUUNTO=m
2209 CONFIG_USB_SERIAL_DEBUG=m
2210
2211 #
2212 @@ -5210,17 +5392,22 @@ CONFIG_USB_TEST=m
2213 CONFIG_USB_ISIGHTFW=m
2214 CONFIG_USB_YUREX=m
2215 CONFIG_USB_EZUSB_FX2=m
2216 -
2217 -#
2218 -# USB Physical Layer drivers
2219 -#
2220 -CONFIG_USB_ISP1301=m
2221 -CONFIG_USB_RCAR_PHY=m
2222 +CONFIG_USB_HSIC_USB3503=m
2223 CONFIG_USB_ATM=m
2224 CONFIG_USB_SPEEDTOUCH=m
2225 CONFIG_USB_CXACRU=m
2226 CONFIG_USB_UEAGLEATM=m
2227 CONFIG_USB_XUSBATM=m
2228 +CONFIG_USB_PHY=y
2229 +CONFIG_NOP_USB_XCEIV=m
2230 +CONFIG_OMAP_CONTROL_USB=m
2231 +CONFIG_OMAP_USB3=m
2232 +CONFIG_SAMSUNG_USBPHY=m
2233 +CONFIG_SAMSUNG_USB2PHY=m
2234 +CONFIG_SAMSUNG_USB3PHY=m
2235 +CONFIG_USB_GPIO_VBUS=m
2236 +CONFIG_USB_ISP1301=m
2237 +CONFIG_USB_RCAR_PHY=m
2238 CONFIG_USB_GADGET=m
2239 # CONFIG_USB_GADGET_DEBUG is not set
2240 # CONFIG_USB_GADGET_DEBUG_FILES is not set
2241 @@ -5231,10 +5418,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
2242 #
2243 # USB Peripheral Controller
2244 #
2245 +CONFIG_USB_FOTG210_UDC=m
2246 CONFIG_USB_R8A66597=m
2247 CONFIG_USB_RENESAS_USBHS_UDC=m
2248 +CONFIG_USB_PXA27X=m
2249 CONFIG_USB_MV_UDC=m
2250 -CONFIG_USB_GADGET_MUSB_HDRC=m
2251 +CONFIG_USB_MV_U3D=m
2252 # CONFIG_USB_M66592 is not set
2253 CONFIG_USB_AMD5536UDC=m
2254 CONFIG_USB_NET2272=m
2255 @@ -5244,7 +5433,31 @@ CONFIG_USB_GOKU=m
2256 CONFIG_USB_EG20T=m
2257 # CONFIG_USB_DUMMY_HCD is not set
2258 CONFIG_USB_LIBCOMPOSITE=m
2259 +CONFIG_USB_F_ACM=m
2260 +CONFIG_USB_F_SS_LB=m
2261 +CONFIG_USB_U_SERIAL=m
2262 +CONFIG_USB_U_ETHER=m
2263 +CONFIG_USB_U_RNDIS=m
2264 +CONFIG_USB_F_SERIAL=m
2265 +CONFIG_USB_F_OBEX=m
2266 +CONFIG_USB_F_NCM=m
2267 +CONFIG_USB_F_ECM=m
2268 +CONFIG_USB_F_PHONET=m
2269 +CONFIG_USB_F_EEM=m
2270 +CONFIG_USB_F_SUBSET=m
2271 +CONFIG_USB_F_RNDIS=m
2272 +CONFIG_USB_CONFIGFS=m
2273 +CONFIG_USB_CONFIGFS_SERIAL=y
2274 +CONFIG_USB_CONFIGFS_ACM=y
2275 +CONFIG_USB_CONFIGFS_OBEX=y
2276 +CONFIG_USB_CONFIGFS_NCM=y
2277 +CONFIG_USB_CONFIGFS_ECM=y
2278 +CONFIG_USB_CONFIGFS_ECM_SUBSET=y
2279 +CONFIG_USB_CONFIGFS_RNDIS=y
2280 +CONFIG_USB_CONFIGFS_EEM=y
2281 +CONFIG_USB_CONFIGFS_PHONET=y
2282 CONFIG_USB_ZERO=m
2283 +CONFIG_USB_ZERO_HNPTEST=y
2284 CONFIG_USB_AUDIO=m
2285 CONFIG_GADGET_UAC1=y
2286 CONFIG_USB_ETH=m
2287 @@ -5264,19 +5477,14 @@ CONFIG_USB_G_PRINTER=m
2288 CONFIG_USB_CDC_COMPOSITE=m
2289 CONFIG_USB_G_NOKIA=m
2290 CONFIG_USB_G_ACM_MS=m
2291 -# CONFIG_USB_G_MULTI is not set
2292 +CONFIG_USB_G_MULTI=m
2293 +CONFIG_USB_G_MULTI_RNDIS=y
2294 +CONFIG_USB_G_MULTI_CDC=y
2295 CONFIG_USB_G_HID=m
2296 CONFIG_USB_G_DBGP=m
2297 # CONFIG_USB_G_DBGP_PRINTK is not set
2298 CONFIG_USB_G_DBGP_SERIAL=y
2299 CONFIG_USB_G_WEBCAM=m
2300 -
2301 -#
2302 -# OTG and related infrastructure
2303 -#
2304 -CONFIG_USB_OTG_UTILS=y
2305 -CONFIG_USB_GPIO_VBUS=m
2306 -CONFIG_NOP_USB_XCEIV=m
2307 CONFIG_UWB=m
2308 CONFIG_UWB_HWA=m
2309 CONFIG_UWB_WHCI=m
2310 @@ -5303,6 +5511,8 @@ CONFIG_MMC_SDHCI_PCI=m
2311 CONFIG_MMC_RICOH_MMC=y
2312 CONFIG_MMC_SDHCI_ACPI=m
2313 CONFIG_MMC_SDHCI_PLTFM=m
2314 +CONFIG_MMC_SDHCI_PXAV3=m
2315 +CONFIG_MMC_SDHCI_PXAV2=m
2316 CONFIG_MMC_WBSD=m
2317 CONFIG_MMC_TIFM_SD=m
2318 CONFIG_MMC_SPI=m
2319 @@ -5335,6 +5545,7 @@ CONFIG_LEDS_CLASS=y
2320 # LED drivers
2321 #
2322 CONFIG_LEDS_88PM860X=m
2323 +CONFIG_LEDS_ATMEL_PWM=m
2324 CONFIG_LEDS_LM3530=m
2325 CONFIG_LEDS_LM3533=m
2326 CONFIG_LEDS_LM3642=m
2327 @@ -5342,8 +5553,10 @@ CONFIG_LEDS_PCA9532=m
2328 CONFIG_LEDS_PCA9532_GPIO=y
2329 CONFIG_LEDS_GPIO=m
2330 CONFIG_LEDS_LP3944=m
2331 +CONFIG_LEDS_LP55XX_COMMON=m
2332 CONFIG_LEDS_LP5521=m
2333 CONFIG_LEDS_LP5523=m
2334 +CONFIG_LEDS_LP5562=m
2335 CONFIG_LEDS_LP8788=m
2336 CONFIG_LEDS_CLEVO_MAIL=m
2337 CONFIG_LEDS_PCA955X=m
2338 @@ -5353,6 +5566,7 @@ CONFIG_LEDS_WM8350=m
2339 CONFIG_LEDS_DA903X=m
2340 CONFIG_LEDS_DA9052=m
2341 CONFIG_LEDS_DAC124S085=m
2342 +CONFIG_LEDS_PWM=m
2343 CONFIG_LEDS_REGULATOR=m
2344 CONFIG_LEDS_BD2802=m
2345 CONFIG_LEDS_INTEL_SS4200=m
2346 @@ -5360,16 +5574,17 @@ CONFIG_LEDS_LT3593=m
2347 CONFIG_LEDS_ADP5520=m
2348 CONFIG_LEDS_DELL_NETBOOKS=m
2349 CONFIG_LEDS_MC13783=m
2350 +CONFIG_LEDS_RENESAS_TPU=y
2351 CONFIG_LEDS_TCA6507=m
2352 CONFIG_LEDS_MAX8997=m
2353 CONFIG_LEDS_LM355x=m
2354 CONFIG_LEDS_OT200=m
2355 CONFIG_LEDS_BLINKM=m
2356 -CONFIG_LEDS_TRIGGERS=y
2357
2358 #
2359 # LED Triggers
2360 #
2361 +CONFIG_LEDS_TRIGGERS=y
2362 CONFIG_LEDS_TRIGGER_TIMER=m
2363 CONFIG_LEDS_TRIGGER_ONESHOT=m
2364 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
2365 @@ -5382,6 +5597,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
2366 # iptables trigger is under Netfilter config (LED target)
2367 #
2368 CONFIG_LEDS_TRIGGER_TRANSIENT=m
2369 +CONFIG_LEDS_TRIGGER_CAMERA=m
2370 # CONFIG_ACCESSIBILITY is not set
2371 CONFIG_INFINIBAND=m
2372 CONFIG_INFINIBAND_USER_MAD=m
2373 @@ -5392,12 +5608,14 @@ CONFIG_INFINIBAND_MTHCA=m
2374 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
2375 CONFIG_INFINIBAND_IPATH=m
2376 CONFIG_INFINIBAND_QIB=m
2377 +CONFIG_INFINIBAND_QIB_DCA=y
2378 CONFIG_INFINIBAND_AMSO1100=m
2379 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
2380 CONFIG_INFINIBAND_CXGB3=m
2381 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
2382 CONFIG_INFINIBAND_CXGB4=m
2383 CONFIG_MLX4_INFINIBAND=m
2384 +CONFIG_MLX5_INFINIBAND=m
2385 CONFIG_INFINIBAND_NES=m
2386 # CONFIG_INFINIBAND_NES_DEBUG is not set
2387 CONFIG_INFINIBAND_OCRDMA=m
2388 @@ -5407,6 +5625,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y
2389 CONFIG_INFINIBAND_SRP=m
2390 CONFIG_INFINIBAND_SRPT=m
2391 CONFIG_INFINIBAND_ISER=m
2392 +CONFIG_INFINIBAND_ISERT=m
2393 CONFIG_EDAC=y
2394 CONFIG_EDAC_LEGACY_SYSFS=y
2395 # CONFIG_EDAC_DEBUG is not set
2396 @@ -5429,6 +5648,7 @@ CONFIG_EDAC_SBRIDGE=m
2397 CONFIG_RTC_LIB=y
2398 CONFIG_RTC_CLASS=y
2399 CONFIG_RTC_HCTOSYS=y
2400 +CONFIG_RTC_SYSTOHC=y
2401 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
2402 # CONFIG_RTC_DEBUG is not set
2403
2404 @@ -5450,23 +5670,28 @@ CONFIG_RTC_DRV_DS1307=m
2405 CONFIG_RTC_DRV_DS1374=m
2406 CONFIG_RTC_DRV_DS1672=m
2407 CONFIG_RTC_DRV_DS3232=m
2408 +CONFIG_RTC_DRV_LP8788=m
2409 CONFIG_RTC_DRV_MAX6900=m
2410 CONFIG_RTC_DRV_MAX8907=m
2411 CONFIG_RTC_DRV_MAX8925=m
2412 CONFIG_RTC_DRV_MAX8998=m
2413 +CONFIG_RTC_DRV_MAX8997=m
2414 +CONFIG_RTC_DRV_MAX77686=m
2415 CONFIG_RTC_DRV_RS5C372=m
2416 CONFIG_RTC_DRV_ISL1208=m
2417 CONFIG_RTC_DRV_ISL12022=m
2418 CONFIG_RTC_DRV_X1205=m
2419 +CONFIG_RTC_DRV_PALMAS=m
2420 +CONFIG_RTC_DRV_PCF2127=m
2421 CONFIG_RTC_DRV_PCF8523=m
2422 CONFIG_RTC_DRV_PCF8563=m
2423 CONFIG_RTC_DRV_PCF8583=m
2424 CONFIG_RTC_DRV_M41T80=m
2425 CONFIG_RTC_DRV_M41T80_WDT=y
2426 CONFIG_RTC_DRV_BQ32K=m
2427 -CONFIG_RTC_DRV_TWL4030=m
2428 CONFIG_RTC_DRV_TPS6586X=m
2429 CONFIG_RTC_DRV_TPS65910=m
2430 +CONFIG_RTC_DRV_TPS80031=m
2431 CONFIG_RTC_DRV_RC5T583=m
2432 CONFIG_RTC_DRV_S35390A=m
2433 CONFIG_RTC_DRV_FM3130=m
2434 @@ -5487,6 +5712,7 @@ CONFIG_RTC_DRV_R9701=m
2435 CONFIG_RTC_DRV_RS5C348=m
2436 CONFIG_RTC_DRV_DS3234=m
2437 CONFIG_RTC_DRV_PCF2123=m
2438 +CONFIG_RTC_DRV_RX4581=m
2439
2440 #
2441 # Platform RTC drivers
2442 @@ -5517,6 +5743,11 @@ CONFIG_RTC_DRV_AB3100=m
2443 #
2444 CONFIG_RTC_DRV_PCAP=m
2445 CONFIG_RTC_DRV_MC13XXX=m
2446 +
2447 +#
2448 +# HID Sensor RTC drivers
2449 +#
2450 +CONFIG_RTC_DRV_HID_SENSOR_TIME=m
2451 CONFIG_DMADEVICES=y
2452 # CONFIG_DMADEVICES_DEBUG is not set
2453
2454 @@ -5525,9 +5756,13 @@ CONFIG_DMADEVICES=y
2455 #
2456 CONFIG_INTEL_MID_DMAC=m
2457 CONFIG_INTEL_IOATDMA=m
2458 +CONFIG_DW_DMAC_CORE=m
2459 +CONFIG_DW_DMAC=m
2460 +CONFIG_DW_DMAC_PCI=m
2461 CONFIG_TIMB_DMA=m
2462 CONFIG_PCH_DMA=m
2463 CONFIG_DMA_ENGINE=y
2464 +CONFIG_DMA_ACPI=y
2465
2466 #
2467 # DMA Clients
2468 @@ -5554,6 +5789,8 @@ CONFIG_UIO_NETX=m
2469 CONFIG_VFIO_IOMMU_TYPE1=m
2470 CONFIG_VFIO=m
2471 CONFIG_VFIO_PCI=m
2472 +CONFIG_VFIO_PCI_VGA=y
2473 +CONFIG_VIRT_DRIVERS=y
2474 CONFIG_VIRTIO=y
2475
2476 #
2477 @@ -5587,7 +5824,7 @@ CONFIG_XEN_XENBUS_FRONTEND=y
2478 CONFIG_XEN_GNTDEV=m
2479 CONFIG_XEN_GRANT_DEV_ALLOC=m
2480 CONFIG_SWIOTLB_XEN=y
2481 -CONFIG_XEN_TMEM=y
2482 +CONFIG_XEN_TMEM=m
2483 CONFIG_XEN_PCIDEV_BACKEND=m
2484 CONFIG_XEN_PRIVCMD=m
2485 CONFIG_XEN_ACPI_PROCESSOR=y
2486 @@ -5616,6 +5853,7 @@ CONFIG_COMEDI_SERIAL2002=m
2487 CONFIG_COMEDI_SKEL=m
2488 CONFIG_COMEDI_PCI_DRIVERS=y
2489 CONFIG_COMEDI_8255_PCI=m
2490 +CONFIG_COMEDI_ADDI_WATCHDOG=m
2491 CONFIG_COMEDI_ADDI_APCI_035=m
2492 CONFIG_COMEDI_ADDI_APCI_1032=m
2493 CONFIG_COMEDI_ADDI_APCI_1500=m
2494 @@ -5634,6 +5872,7 @@ CONFIG_COMEDI_ADL_PCI9111=m
2495 CONFIG_COMEDI_ADL_PCI9118=m
2496 CONFIG_COMEDI_ADV_PCI1710=m
2497 CONFIG_COMEDI_ADV_PCI1723=m
2498 +CONFIG_COMEDI_ADV_PCI1724=m
2499 CONFIG_COMEDI_ADV_PCI_DIO=m
2500 CONFIG_COMEDI_AMPLC_DIO200_PCI=m
2501 CONFIG_COMEDI_AMPLC_PC236_PCI=m
2502 @@ -5662,11 +5901,10 @@ CONFIG_COMEDI_NI_6527=m
2503 CONFIG_COMEDI_NI_65XX=m
2504 CONFIG_COMEDI_NI_660X=m
2505 CONFIG_COMEDI_NI_670X=m
2506 -CONFIG_COMEDI_NI_LABPC=m
2507 +CONFIG_COMEDI_NI_LABPC_PCI=m
2508 CONFIG_COMEDI_NI_PCIDIO=m
2509 CONFIG_COMEDI_NI_PCIMIO=m
2510 CONFIG_COMEDI_RTD520=m
2511 -CONFIG_COMEDI_S526=m
2512 CONFIG_COMEDI_S626=m
2513 CONFIG_COMEDI_SSV_DNP=m
2514 CONFIG_COMEDI_MITE=m
2515 @@ -5689,8 +5927,8 @@ CONFIG_COMEDI_8255=m
2516 CONFIG_COMEDI_FC=m
2517 CONFIG_COMEDI_AMPLC_DIO200=m
2518 CONFIG_COMEDI_AMPLC_PC236=m
2519 -CONFIG_COMEDI_AMPLC_PC263=m
2520 CONFIG_COMEDI_DAS08=m
2521 +CONFIG_COMEDI_NI_LABPC=m
2522 CONFIG_COMEDI_NI_TIO=m
2523 CONFIG_ASUS_OLED=m
2524 CONFIG_PANEL=m
2525 @@ -5710,7 +5948,6 @@ CONFIG_RTS5139=m
2526 CONFIG_TRANZPORT=m
2527 CONFIG_IDE_PHISON=m
2528 CONFIG_LINE6_USB=m
2529 -# CONFIG_LINE6_USB_DUMP_PCM is not set
2530 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
2531 CONFIG_USB_SERIAL_QUATECH2=m
2532 CONFIG_VT6655=m
2533 @@ -5720,8 +5957,6 @@ CONFIG_DX_SEP=m
2534 #
2535 # IIO staging drivers
2536 #
2537 -CONFIG_IIO_ST_HWMON=m
2538 -CONFIG_IIO_SW_RING=m
2539
2540 #
2541 # Accelerometers
2542 @@ -5732,10 +5967,7 @@ CONFIG_ADIS16204=m
2543 CONFIG_ADIS16209=m
2544 CONFIG_ADIS16220=m
2545 CONFIG_ADIS16240=m
2546 -CONFIG_KXSD9=m
2547 CONFIG_LIS3L02DQ=m
2548 -CONFIG_LIS3L02DQ_BUF_KFIFO=y
2549 -# CONFIG_LIS3L02DQ_BUF_RING_SW is not set
2550 CONFIG_SCA3000=m
2551
2552 #
2553 @@ -5750,7 +5982,6 @@ CONFIG_AD799X_RING_BUFFER=y
2554 CONFIG_AD7780=m
2555 CONFIG_AD7816=m
2556 CONFIG_AD7192=m
2557 -CONFIG_ADT7410=m
2558 CONFIG_AD7280=m
2559
2560 #
2561 @@ -5782,10 +6013,7 @@ CONFIG_AD9951=m
2562 # Digital gyroscope sensors
2563 #
2564 CONFIG_ADIS16060=m
2565 -CONFIG_ADIS16080=m
2566 -CONFIG_ADIS16130=m
2567 CONFIG_ADIS16260=m
2568 -CONFIG_ADXRS450=m
2569
2570 #
2571 # Network Analyzer, Impedance Converters
2572 @@ -5793,23 +6021,16 @@ CONFIG_ADXRS450=m
2573 CONFIG_AD5933=m
2574
2575 #
2576 -# Inertial measurement units
2577 -#
2578 -CONFIG_ADIS16400=m
2579 -
2580 -#
2581 # Light sensors
2582 #
2583 CONFIG_SENSORS_ISL29018=m
2584 CONFIG_SENSORS_ISL29028=m
2585 -CONFIG_SENSORS_TSL2563=m
2586 CONFIG_TSL2583=m
2587 CONFIG_TSL2x7x=m
2588
2589 #
2590 # Magnetometer sensors
2591 #
2592 -CONFIG_SENSORS_AK8975=m
2593 CONFIG_SENSORS_HMC5843=m
2594
2595 #
2596 @@ -5834,15 +6055,12 @@ CONFIG_AD2S1210=m
2597 # Triggers - standalone
2598 #
2599 CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
2600 -CONFIG_IIO_GPIO_TRIGGER=m
2601 -CONFIG_IIO_SYSFS_TRIGGER=m
2602 CONFIG_IIO_SIMPLE_DUMMY=m
2603 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
2604 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
2605 +CONFIG_ZSMALLOC=y
2606 CONFIG_ZRAM=m
2607 # CONFIG_ZRAM_DEBUG is not set
2608 -CONFIG_ZCACHE=y
2609 -CONFIG_ZSMALLOC=y
2610 CONFIG_WLAGS49_H2=m
2611 CONFIG_WLAGS49_H25=m
2612 CONFIG_FB_SM7XX=m
2613 @@ -5887,14 +6105,8 @@ CONFIG_VIDEO_DT3155=m
2614 CONFIG_DT3155_STREAMING=y
2615 CONFIG_VIDEO_GO7007=m
2616 CONFIG_VIDEO_GO7007_USB=m
2617 +CONFIG_VIDEO_GO7007_LOADER=m
2618 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
2619 -CONFIG_VIDEO_GO7007_OV7640=m
2620 -CONFIG_VIDEO_GO7007_SAA7113=m
2621 -CONFIG_VIDEO_GO7007_SAA7115=m
2622 -CONFIG_VIDEO_GO7007_TW9903=m
2623 -CONFIG_VIDEO_GO7007_UDA1342=m
2624 -CONFIG_VIDEO_GO7007_SONY_TUNER=m
2625 -CONFIG_VIDEO_GO7007_TW2804=m
2626 CONFIG_SOLO6X10=m
2627 CONFIG_LIRC_STAGING=y
2628 CONFIG_LIRC_BT829=m
2629 @@ -5918,6 +6130,9 @@ CONFIG_ANDROID_TIMED_OUTPUT=y
2630 CONFIG_ANDROID_TIMED_GPIO=m
2631 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
2632 CONFIG_ANDROID_INTF_ALARM_DEV=y
2633 +CONFIG_SYNC=y
2634 +CONFIG_SW_SYNC=y
2635 +CONFIG_SW_SYNC_USER=y
2636 CONFIG_USB_WPAN_HCD=m
2637 CONFIG_WIMAX_GDM72XX=m
2638 CONFIG_WIMAX_GDM72XX_QOS=y
2639 @@ -5926,18 +6141,23 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
2640 CONFIG_WIMAX_GDM72XX_USB=y
2641 # CONFIG_WIMAX_GDM72XX_SDIO is not set
2642 CONFIG_WIMAX_GDM72XX_USB_PM=y
2643 -CONFIG_CSR_WIFI=m
2644 CONFIG_NET_VENDOR_SILICOM=y
2645 CONFIG_SBYPASS=m
2646 CONFIG_BPCTL=m
2647 CONFIG_CED1401=m
2648 CONFIG_DGRP=m
2649 -CONFIG_SB105X=m
2650 CONFIG_FIREWIRE_SERIAL=m
2651 +CONFIG_ZCACHE=y
2652 +# CONFIG_ZCACHE_DEBUG is not set
2653 +CONFIG_USB_DWC2=m
2654 +# CONFIG_USB_DWC2_DEBUG is not set
2655 +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
2656 +CONFIG_USB_BTMTK=m
2657 CONFIG_X86_PLATFORM_DEVICES=y
2658 CONFIG_ACER_WMI=m
2659 CONFIG_ACERHDF=m
2660 CONFIG_ASUS_LAPTOP=m
2661 +CONFIG_CHROMEOS_LAPTOP=m
2662 CONFIG_DELL_LAPTOP=m
2663 CONFIG_DELL_WMI=m
2664 CONFIG_DELL_WMI_AIO=m
2665 @@ -5980,6 +6200,21 @@ CONFIG_MXM_WMI=m
2666 CONFIG_INTEL_OAKTRAIL=m
2667 CONFIG_SAMSUNG_Q10=m
2668 CONFIG_APPLE_GMUX=m
2669 +CONFIG_INTEL_RST=m
2670 +CONFIG_INTEL_SMARTCONNECT=m
2671 +CONFIG_PVPANIC=m
2672 +CONFIG_CLKDEV_LOOKUP=y
2673 +CONFIG_HAVE_CLK_PREPARE=y
2674 +CONFIG_COMMON_CLK=y
2675 +
2676 +#
2677 +# Common Clock Framework
2678 +#
2679 +# CONFIG_COMMON_CLK_DEBUG is not set
2680 +CONFIG_COMMON_CLK_WM831X=m
2681 +CONFIG_COMMON_CLK_MAX77686=m
2682 +CONFIG_COMMON_CLK_SI5351=m
2683 +CONFIG_CLK_TWL6040=m
2684
2685 #
2686 # Hardware Spinlock drivers
2687 @@ -5987,6 +6222,7 @@ CONFIG_APPLE_GMUX=m
2688 CONFIG_CLKEVT_I8253=y
2689 CONFIG_I8253_LOCK=y
2690 CONFIG_CLKBLD_I8253=y
2691 +CONFIG_MAILBOX=y
2692 CONFIG_IOMMU_API=y
2693 CONFIG_IOMMU_SUPPORT=y
2694 CONFIG_AMD_IOMMU=y
2695 @@ -5999,15 +6235,14 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
2696 CONFIG_IRQ_REMAP=y
2697
2698 #
2699 -# Remoteproc drivers (EXPERIMENTAL)
2700 +# Remoteproc drivers
2701 #
2702 CONFIG_REMOTEPROC=m
2703 CONFIG_STE_MODEM_RPROC=m
2704
2705 #
2706 -# Rpmsg drivers (EXPERIMENTAL)
2707 +# Rpmsg drivers
2708 #
2709 -CONFIG_VIRT_DRIVERS=y
2710 CONFIG_PM_DEVFREQ=y
2711
2712 #
2713 @@ -6031,6 +6266,7 @@ CONFIG_EXTCON_ADC_JACK=m
2714 CONFIG_EXTCON_MAX77693=m
2715 CONFIG_EXTCON_MAX8997=m
2716 CONFIG_EXTCON_ARIZONA=m
2717 +CONFIG_EXTCON_PALMAS=m
2718 CONFIG_MEMORY=y
2719 CONFIG_IIO=m
2720 CONFIG_IIO_BUFFER=y
2721 @@ -6044,6 +6280,10 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
2722 # Accelerometers
2723 #
2724 CONFIG_HID_SENSOR_ACCEL_3D=m
2725 +CONFIG_KXSD9=m
2726 +CONFIG_IIO_ST_ACCEL_3AXIS=m
2727 +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
2728 +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
2729
2730 #
2731 # Analog to digital converters
2732 @@ -6051,12 +6291,14 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
2733 CONFIG_AD_SIGMA_DELTA=m
2734 CONFIG_AD7266=m
2735 CONFIG_AD7298=m
2736 +CONFIG_AD7923=m
2737 CONFIG_AD7791=m
2738 CONFIG_AD7793=m
2739 CONFIG_AD7476=m
2740 CONFIG_AD7887=m
2741 CONFIG_LP8788_ADC=y
2742 CONFIG_MAX1363=m
2743 +CONFIG_MCP320X=m
2744 CONFIG_TI_ADC081C=m
2745 CONFIG_TI_AM335X_ADC=m
2746 CONFIG_VIPERBOARD_ADC=m
2747 @@ -6072,6 +6314,9 @@ CONFIG_AD8366=m
2748 CONFIG_HID_SENSOR_IIO_COMMON=m
2749 CONFIG_HID_SENSOR_IIO_TRIGGER=m
2750 # CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS is not set
2751 +CONFIG_IIO_ST_SENSORS_I2C=m
2752 +CONFIG_IIO_ST_SENSORS_SPI=m
2753 +CONFIG_IIO_ST_SENSORS_CORE=m
2754
2755 #
2756 # Digital to analog converters
2757 @@ -6088,6 +6333,7 @@ CONFIG_AD5755=m
2758 CONFIG_AD5764=m
2759 CONFIG_AD5791=m
2760 CONFIG_AD5686=m
2761 +CONFIG_AD7303=m
2762 CONFIG_MAX517=m
2763 CONFIG_MCP4725=m
2764
2765 @@ -6108,28 +6354,56 @@ CONFIG_ADF4350=m
2766 #
2767 # Digital gyroscope sensors
2768 #
2769 +CONFIG_ADIS16080=m
2770 +CONFIG_ADIS16130=m
2771 CONFIG_ADIS16136=m
2772 +CONFIG_ADXRS450=m
2773 CONFIG_HID_SENSOR_GYRO_3D=m
2774 +CONFIG_IIO_ST_GYRO_3AXIS=m
2775 +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
2776 +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
2777 +CONFIG_ITG3200=m
2778
2779 #
2780 # Inertial measurement units
2781 #
2782 +CONFIG_ADIS16400=m
2783 CONFIG_ADIS16480=m
2784 CONFIG_IIO_ADIS_LIB=m
2785 CONFIG_IIO_ADIS_LIB_BUFFER=y
2786 +CONFIG_INV_MPU6050_IIO=m
2787
2788 #
2789 # Light sensors
2790 #
2791 CONFIG_ADJD_S311=m
2792 CONFIG_SENSORS_LM3533=m
2793 +CONFIG_SENSORS_TSL2563=m
2794 CONFIG_VCNL4000=m
2795 CONFIG_HID_SENSOR_ALS=m
2796
2797 #
2798 # Magnetometer sensors
2799 #
2800 +CONFIG_AK8975=m
2801 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
2802 +CONFIG_IIO_ST_MAGN_3AXIS=m
2803 +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
2804 +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
2805 +
2806 +#
2807 +# Triggers - standalone
2808 +#
2809 +CONFIG_IIO_INTERRUPT_TRIGGER=m
2810 +CONFIG_IIO_SYSFS_TRIGGER=m
2811 +
2812 +#
2813 +# Pressure Sensors
2814 +#
2815 +CONFIG_IIO_ST_PRESS=m
2816 +CONFIG_IIO_ST_PRESS_I2C=m
2817 +CONFIG_IIO_ST_PRESS_SPI=m
2818 +CONFIG_NTB=m
2819 CONFIG_VME_BUS=m
2820
2821 #
2822 @@ -6149,11 +6423,16 @@ CONFIG_VMIVME_7805=m
2823 CONFIG_VME_USER=m
2824 CONFIG_VME_PIO2=m
2825 CONFIG_PWM=y
2826 -CONFIG_PWM_TWL=m
2827 -CONFIG_PWM_TWL_LED=m
2828 +CONFIG_PWM_SYSFS=y
2829 CONFIG_IPACK_BUS=m
2830 CONFIG_BOARD_TPCI200=m
2831 CONFIG_SERIAL_IPOCTAL=m
2832 +CONFIG_RESET_CONTROLLER=y
2833 +CONFIG_FMC=m
2834 +CONFIG_FMC_FAKEDEV=m
2835 +CONFIG_FMC_TRIVIAL=m
2836 +CONFIG_FMC_WRITE_EEPROM=m
2837 +CONFIG_FMC_CHARDEV=m
2838
2839 #
2840 # Firmware Drivers
2841 @@ -6161,8 +6440,6 @@ CONFIG_SERIAL_IPOCTAL=m
2842 CONFIG_EDD=y
2843 CONFIG_EDD_OFF=y
2844 CONFIG_FIRMWARE_MEMMAP=y
2845 -CONFIG_EFI_VARS=y
2846 -# CONFIG_EFI_VARS_PSTORE is not set
2847 CONFIG_DELL_RBU=m
2848 CONFIG_DCDBAS=m
2849 CONFIG_DMIID=y
2850 @@ -6172,10 +6449,17 @@ CONFIG_ISCSI_IBFT=m
2851 # CONFIG_GOOGLE_FIRMWARE is not set
2852
2853 #
2854 +# EFI (Extensible Firmware Interface) Support
2855 +#
2856 +CONFIG_EFI_VARS=y
2857 +CONFIG_EFI_VARS_PSTORE=m
2858 +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
2859 +
2860 +#
2861 # File systems
2862 #
2863 CONFIG_DCACHE_WORD_ACCESS=y
2864 -CONFIG_EXT2_FS=m
2865 +CONFIG_EXT2_FS=y
2866 CONFIG_EXT2_FS_XATTR=y
2867 CONFIG_EXT2_FS_POSIX_ACL=y
2868 CONFIG_EXT2_FS_SECURITY=y
2869 @@ -6209,6 +6493,7 @@ CONFIG_XFS_FS=m
2870 CONFIG_XFS_QUOTA=y
2871 CONFIG_XFS_POSIX_ACL=y
2872 CONFIG_XFS_RT=y
2873 +# CONFIG_XFS_WARN is not set
2874 # CONFIG_XFS_DEBUG is not set
2875 CONFIG_GFS2_FS=m
2876 CONFIG_GFS2_FS_LOCKING_DLM=y
2877 @@ -6218,9 +6503,11 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
2878 CONFIG_OCFS2_FS_STATS=y
2879 CONFIG_OCFS2_DEBUG_MASKLOG=y
2880 # CONFIG_OCFS2_DEBUG_FS is not set
2881 -CONFIG_BTRFS_FS=m
2882 +CONFIG_BTRFS_FS=y
2883 CONFIG_BTRFS_FS_POSIX_ACL=y
2884 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
2885 +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
2886 +# CONFIG_BTRFS_DEBUG is not set
2887 CONFIG_NILFS2_FS=m
2888 CONFIG_FS_POSIX_ACL=y
2889 CONFIG_EXPORTFS=y
2890 @@ -6237,7 +6524,6 @@ CONFIG_QUOTA_TREE=m
2891 CONFIG_QFMT_V1=m
2892 CONFIG_QFMT_V2=m
2893 CONFIG_QUOTACTL=y
2894 -CONFIG_QUOTACTL_COMPAT=y
2895 CONFIG_AUTOFS4_FS=m
2896 CONFIG_FUSE_FS=y
2897 CONFIG_CUSE=m
2898 @@ -6274,7 +6560,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
2899 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
2900 CONFIG_NTFS_FS=m
2901 # CONFIG_NTFS_DEBUG is not set
2902 -# CONFIG_NTFS_RW is not set
2903 +CONFIG_NTFS_RW=y
2904
2905 #
2906 # Pseudo filesystems
2907 @@ -6293,6 +6579,7 @@ CONFIG_ADFS_FS=m
2908 # CONFIG_ADFS_FS_RW is not set
2909 CONFIG_AFFS_FS=m
2910 CONFIG_ECRYPT_FS=y
2911 +CONFIG_ECRYPT_FS_MESSAGING=y
2912 CONFIG_HFS_FS=m
2913 CONFIG_HFSPLUS_FS=m
2914 CONFIG_BEFS_FS=m
2915 @@ -6344,7 +6631,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
2916 CONFIG_ROMFS_ON_BLOCK=y
2917 CONFIG_PSTORE=y
2918 # CONFIG_PSTORE_CONSOLE is not set
2919 -# CONFIG_PSTORE_FTRACE is not set
2920 CONFIG_PSTORE_RAM=m
2921 CONFIG_SYSV_FS=m
2922 CONFIG_UFS_FS=m
2923 @@ -6356,6 +6642,8 @@ CONFIG_F2FS_FS=m
2924 CONFIG_F2FS_STAT_FS=y
2925 CONFIG_F2FS_FS_XATTR=y
2926 CONFIG_F2FS_FS_POSIX_ACL=y
2927 +CONFIG_F2FS_FS_SECURITY=y
2928 +CONFIG_EFIVAR_FS=y
2929 CONFIG_ORE=m
2930 CONFIG_NETWORK_FILESYSTEMS=y
2931 CONFIG_NFS_FS=m
2932 @@ -6365,6 +6653,7 @@ CONFIG_NFS_V3_ACL=y
2933 CONFIG_NFS_V4=m
2934 CONFIG_NFS_SWAP=y
2935 CONFIG_NFS_V4_1=y
2936 +CONFIG_NFS_V4_2=y
2937 CONFIG_PNFS_FILE_LAYOUT=m
2938 CONFIG_PNFS_BLOCK=m
2939 CONFIG_PNFS_OBJLAYOUT=m
2940 @@ -6372,6 +6661,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
2941 CONFIG_NFS_FSCACHE=y
2942 # CONFIG_NFS_USE_LEGACY_DNS is not set
2943 CONFIG_NFS_USE_KERNEL_DNS=y
2944 +CONFIG_NFS_DEBUG=y
2945 CONFIG_NFSD=m
2946 CONFIG_NFSD_V2_ACL=y
2947 CONFIG_NFSD_V3=y
2948 @@ -6388,7 +6678,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
2949 CONFIG_SUNRPC_XPRT_RDMA=m
2950 CONFIG_SUNRPC_SWAP=y
2951 CONFIG_RPCSEC_GSS_KRB5=m
2952 -# CONFIG_SUNRPC_DEBUG is not set
2953 +CONFIG_SUNRPC_DEBUG=y
2954 CONFIG_CEPH_FS=m
2955 CONFIG_CIFS=m
2956 CONFIG_CIFS_STATS=y
2957 @@ -6419,6 +6709,7 @@ CONFIG_AFS_FS=m
2958 CONFIG_9P_FS=m
2959 # CONFIG_9P_FSCACHE is not set
2960 CONFIG_9P_FS_POSIX_ACL=y
2961 +CONFIG_9P_FS_SECURITY=y
2962 CONFIG_NLS=y
2963 CONFIG_NLS_DEFAULT="utf8"
2964 CONFIG_NLS_CODEPAGE_437=y
2965 @@ -6477,149 +6768,147 @@ CONFIG_DLM=m
2966 # Kernel hacking
2967 #
2968 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
2969 +
2970 +#
2971 +# printk and dmesg options
2972 +#
2973 CONFIG_PRINTK_TIME=y
2974 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
2975 +CONFIG_BOOT_PRINTK_DELAY=y
2976 +CONFIG_DYNAMIC_DEBUG=y
2977 +
2978 +#
2979 +# Compile-time checks and compiler options
2980 +#
2981 +# CONFIG_DEBUG_INFO is not set
2982 # CONFIG_ENABLE_WARN_DEPRECATED is not set
2983 # CONFIG_ENABLE_MUST_CHECK is not set
2984 CONFIG_FRAME_WARN=1024
2985 -CONFIG_MAGIC_SYSRQ=y
2986 # CONFIG_STRIP_ASM_SYMS is not set
2987 # CONFIG_READABLE_ASM is not set
2988 -CONFIG_UNUSED_SYMBOLS=y
2989 +# CONFIG_UNUSED_SYMBOLS is not set
2990 CONFIG_DEBUG_FS=y
2991 # CONFIG_HEADERS_CHECK is not set
2992 # CONFIG_DEBUG_SECTION_MISMATCH is not set
2993 +CONFIG_ARCH_WANT_FRAME_POINTERS=y
2994 +# CONFIG_FRAME_POINTER is not set
2995 +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
2996 +CONFIG_MAGIC_SYSRQ=y
2997 CONFIG_DEBUG_KERNEL=y
2998 +
2999 +#
3000 +# Memory Debugging
3001 +#
3002 +# CONFIG_DEBUG_PAGEALLOC is not set
3003 +# CONFIG_DEBUG_OBJECTS is not set
3004 +# CONFIG_SLUB_DEBUG_ON is not set
3005 +# CONFIG_SLUB_STATS is not set
3006 +CONFIG_HAVE_DEBUG_KMEMLEAK=y
3007 +# CONFIG_DEBUG_KMEMLEAK is not set
3008 +# CONFIG_DEBUG_STACK_USAGE is not set
3009 +# CONFIG_DEBUG_VM is not set
3010 +# CONFIG_DEBUG_VIRTUAL is not set
3011 +# CONFIG_DEBUG_MEMORY_INIT is not set
3012 +# CONFIG_DEBUG_PER_CPU_MAPS is not set
3013 +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
3014 +# CONFIG_DEBUG_STACKOVERFLOW is not set
3015 +CONFIG_HAVE_ARCH_KMEMCHECK=y
3016 +# CONFIG_KMEMCHECK is not set
3017 # CONFIG_DEBUG_SHIRQ is not set
3018 +
3019 +#
3020 +# Debug Lockups and Hangs
3021 +#
3022 CONFIG_LOCKUP_DETECTOR=y
3023 CONFIG_HARDLOCKUP_DETECTOR=y
3024 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
3025 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
3026 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
3027 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
3028 -# CONFIG_PANIC_ON_OOPS is not set
3029 -CONFIG_PANIC_ON_OOPS_VALUE=0
3030 CONFIG_DETECT_HUNG_TASK=y
3031 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
3032 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
3033 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
3034 +# CONFIG_PANIC_ON_OOPS is not set
3035 +CONFIG_PANIC_ON_OOPS_VALUE=0
3036 CONFIG_SCHED_DEBUG=y
3037 CONFIG_SCHEDSTATS=y
3038 CONFIG_TIMER_STATS=y
3039 -# CONFIG_DEBUG_OBJECTS is not set
3040 -# CONFIG_SLUB_DEBUG_ON is not set
3041 -# CONFIG_SLUB_STATS is not set
3042 -CONFIG_HAVE_DEBUG_KMEMLEAK=y
3043 -# CONFIG_DEBUG_KMEMLEAK is not set
3044 +
3045 +#
3046 +# Lock Debugging (spinlocks, mutexes, etc...)
3047 +#
3048 # CONFIG_DEBUG_RT_MUTEXES is not set
3049 # CONFIG_RT_MUTEX_TESTER is not set
3050 # CONFIG_DEBUG_SPINLOCK is not set
3051 # CONFIG_DEBUG_MUTEXES is not set
3052 +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
3053 # CONFIG_DEBUG_LOCK_ALLOC is not set
3054 # CONFIG_PROVE_LOCKING is not set
3055 -# CONFIG_SPARSE_RCU_POINTER is not set
3056 # CONFIG_LOCK_STAT is not set
3057 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
3058 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
3059 -CONFIG_STACKTRACE=y
3060 -# CONFIG_DEBUG_STACK_USAGE is not set
3061 # CONFIG_DEBUG_KOBJECT is not set
3062 # CONFIG_DEBUG_BUGVERBOSE is not set
3063 -CONFIG_DEBUG_INFO=y
3064 -# CONFIG_DEBUG_INFO_REDUCED is not set
3065 -# CONFIG_DEBUG_VM is not set
3066 -# CONFIG_DEBUG_VIRTUAL is not set
3067 # CONFIG_DEBUG_WRITECOUNT is not set
3068 -# CONFIG_DEBUG_MEMORY_INIT is not set
3069 # CONFIG_DEBUG_LIST is not set
3070 -# CONFIG_TEST_LIST_SORT is not set
3071 # CONFIG_DEBUG_SG is not set
3072 # CONFIG_DEBUG_NOTIFIERS is not set
3073 # CONFIG_DEBUG_CREDENTIALS is not set
3074 -CONFIG_ARCH_WANT_FRAME_POINTERS=y
3075 -CONFIG_FRAME_POINTER=y
3076 -CONFIG_BOOT_PRINTK_DELAY=y
3077 +
3078 +#
3079 +# RCU Debugging
3080 +#
3081 +# CONFIG_SPARSE_RCU_POINTER is not set
3082 # CONFIG_RCU_TORTURE_TEST is not set
3083 CONFIG_RCU_CPU_STALL_TIMEOUT=60
3084 # CONFIG_RCU_CPU_STALL_INFO is not set
3085 # CONFIG_RCU_TRACE is not set
3086 -# CONFIG_KPROBES_SANITY_TEST is not set
3087 -# CONFIG_BACKTRACE_SELF_TEST is not set
3088 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
3089 -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
3090 -# CONFIG_DEBUG_PER_CPU_MAPS is not set
3091 -# CONFIG_LKDTM is not set
3092 -CONFIG_NOTIFIER_ERROR_INJECTION=m
3093 -CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
3094 -CONFIG_PM_NOTIFIER_ERROR_INJECT=m
3095 -CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
3096 +# CONFIG_NOTIFIER_ERROR_INJECTION is not set
3097 # CONFIG_FAULT_INJECTION is not set
3098 -# CONFIG_DEBUG_PAGEALLOC is not set
3099 +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
3100 CONFIG_USER_STACKTRACE_SUPPORT=y
3101 -CONFIG_NOP_TRACER=y
3102 CONFIG_HAVE_FUNCTION_TRACER=y
3103 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
3104 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
3105 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
3106 CONFIG_HAVE_DYNAMIC_FTRACE=y
3107 +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
3108 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
3109 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
3110 CONFIG_HAVE_FENTRY=y
3111 CONFIG_HAVE_C_RECORDMCOUNT=y
3112 -CONFIG_TRACER_MAX_TRACE=y
3113 CONFIG_TRACE_CLOCK=y
3114 CONFIG_RING_BUFFER=y
3115 -CONFIG_EVENT_TRACING=y
3116 -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
3117 -CONFIG_CONTEXT_SWITCH_TRACER=y
3118 CONFIG_RING_BUFFER_ALLOW_SWAP=y
3119 -CONFIG_TRACING=y
3120 -CONFIG_GENERIC_TRACER=y
3121 CONFIG_TRACING_SUPPORT=y
3122 -CONFIG_FTRACE=y
3123 -CONFIG_FUNCTION_TRACER=y
3124 -CONFIG_FUNCTION_GRAPH_TRACER=y
3125 -# CONFIG_IRQSOFF_TRACER is not set
3126 -CONFIG_SCHED_TRACER=y
3127 -CONFIG_FTRACE_SYSCALLS=y
3128 -CONFIG_BRANCH_PROFILE_NONE=y
3129 -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
3130 -# CONFIG_PROFILE_ALL_BRANCHES is not set
3131 -CONFIG_STACK_TRACER=y
3132 -CONFIG_BLK_DEV_IO_TRACE=y
3133 -CONFIG_KPROBE_EVENT=y
3134 -CONFIG_UPROBE_EVENT=y
3135 -CONFIG_PROBE_EVENTS=y
3136 -CONFIG_DYNAMIC_FTRACE=y
3137 -CONFIG_FUNCTION_PROFILER=y
3138 -CONFIG_FTRACE_MCOUNT_RECORD=y
3139 -# CONFIG_FTRACE_STARTUP_TEST is not set
3140 -CONFIG_MMIOTRACE=y
3141 -# CONFIG_MMIOTRACE_TEST is not set
3142 -# CONFIG_RING_BUFFER_BENCHMARK is not set
3143 -CONFIG_RBTREE_TEST=m
3144 -CONFIG_INTERVAL_TREE_TEST=m
3145 -# CONFIG_DYNAMIC_DEBUG is not set
3146 -# CONFIG_DMA_API_DEBUG is not set
3147 +# CONFIG_FTRACE is not set
3148 +
3149 +#
3150 +# Runtime Testing
3151 +#
3152 +# CONFIG_LKDTM is not set
3153 +# CONFIG_TEST_LIST_SORT is not set
3154 +# CONFIG_KPROBES_SANITY_TEST is not set
3155 +# CONFIG_BACKTRACE_SELF_TEST is not set
3156 +# CONFIG_RBTREE_TEST is not set
3157 +# CONFIG_INTERVAL_TREE_TEST is not set
3158 # CONFIG_ATOMIC64_SELFTEST is not set
3159 -CONFIG_ASYNC_RAID6_TEST=m
3160 +# CONFIG_ASYNC_RAID6_TEST is not set
3161 +# CONFIG_TEST_STRING_HELPERS is not set
3162 +# CONFIG_TEST_KSTRTOX is not set
3163 +# CONFIG_DMA_API_DEBUG is not set
3164 # CONFIG_SAMPLES is not set
3165 CONFIG_HAVE_ARCH_KGDB=y
3166 -CONFIG_KGDB=y
3167 -CONFIG_KGDB_SERIAL_CONSOLE=y
3168 -# CONFIG_KGDB_TESTS is not set
3169 -CONFIG_KGDB_LOW_LEVEL_TRAP=y
3170 -CONFIG_KGDB_KDB=y
3171 -CONFIG_KDB_KEYBOARD=y
3172 -CONFIG_HAVE_ARCH_KMEMCHECK=y
3173 -CONFIG_TEST_KSTRTOX=m
3174 +# CONFIG_KGDB is not set
3175 CONFIG_STRICT_DEVMEM=y
3176 # CONFIG_X86_VERBOSE_BOOTUP is not set
3177 CONFIG_EARLY_PRINTK=y
3178 CONFIG_EARLY_PRINTK_DBGP=y
3179 -# CONFIG_DEBUG_STACKOVERFLOW is not set
3180 # CONFIG_X86_PTDUMP is not set
3181 # CONFIG_DEBUG_NX_TEST is not set
3182 +CONFIG_DOUBLEFAULT=y
3183 # CONFIG_DEBUG_TLBFLUSH is not set
3184 # CONFIG_IOMMU_DEBUG is not set
3185 # CONFIG_IOMMU_STRESS is not set
3186 @@ -6636,8 +6925,9 @@ CONFIG_IO_DELAY_0XED=y
3187 CONFIG_DEFAULT_IO_DELAY_TYPE=1
3188 # CONFIG_DEBUG_BOOT_PARAMS is not set
3189 # CONFIG_CPA_DEBUG is not set
3190 -CONFIG_OPTIMIZE_INLINING=y
3191 +# CONFIG_OPTIMIZE_INLINING is not set
3192 # CONFIG_DEBUG_NMI_SELFTEST is not set
3193 +# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
3194
3195 #
3196 # Security options
3197 @@ -6710,6 +7000,7 @@ CONFIG_PAX_LATENT_ENTROPY=y
3198 CONFIG_GRKERNSEC_KMEM=y
3199 # CONFIG_GRKERNSEC_IO is not set
3200 CONFIG_GRKERNSEC_JIT_HARDEN=y
3201 +CONFIG_GRKERNSEC_PERF_HARDEN=y
3202 CONFIG_GRKERNSEC_RAND_THREADSTACK=y
3203 CONFIG_GRKERNSEC_PROC_MEMMAP=y
3204 CONFIG_GRKERNSEC_BRUTE=y
3205 @@ -6735,7 +7026,7 @@ CONFIG_GRKERNSEC_PROC_ADD=y
3206 CONFIG_GRKERNSEC_LINK=y
3207 CONFIG_GRKERNSEC_SYMLINKOWN=y
3208 CONFIG_GRKERNSEC_FIFO=y
3209 -# CONFIG_GRKERNSEC_SYSFS_RESTRICT is not set
3210 +CONFIG_GRKERNSEC_SYSFS_RESTRICT=y
3211 CONFIG_GRKERNSEC_ROFS=y
3212 CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL=y
3213 CONFIG_GRKERNSEC_CHROOT=y
3214 @@ -6752,13 +7043,13 @@ CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
3215 CONFIG_GRKERNSEC_CHROOT_NICE=y
3216 CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
3217 CONFIG_GRKERNSEC_CHROOT_CAPS=y
3218 -# CONFIG_GRKERNSEC_CHROOT_INITRD is not set
3219 +CONFIG_GRKERNSEC_CHROOT_INITRD=y
3220
3221 #
3222 # Kernel Auditing
3223 #
3224 CONFIG_GRKERNSEC_AUDIT_GROUP=y
3225 -CONFIG_GRKERNSEC_AUDIT_GID=9995
3226 +CONFIG_GRKERNSEC_AUDIT_GID=100
3227 CONFIG_GRKERNSEC_EXECLOG=y
3228 CONFIG_GRKERNSEC_RESLOG=y
3229 CONFIG_GRKERNSEC_CHROOT_EXECLOG=y
3230 @@ -6770,7 +7061,6 @@ CONFIG_GRKERNSEC_FORKFAIL=y
3231 CONFIG_GRKERNSEC_TIME=y
3232 CONFIG_GRKERNSEC_PROC_IPADDR=y
3233 CONFIG_GRKERNSEC_RWXMAP_LOG=y
3234 -# CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set
3235
3236 #
3237 # Executable Protections
3238 @@ -6799,6 +7089,12 @@ CONFIG_GRKERNSEC_SOCKET_SERVER=y
3239 CONFIG_GRKERNSEC_SOCKET_SERVER_GID=9999
3240
3241 #
3242 +# Physical Protections
3243 +#
3244 +CONFIG_GRKERNSEC_DENYUSB=y
3245 +# CONFIG_GRKERNSEC_DENYUSB_FORCE is not set
3246 +
3247 +#
3248 # Sysctl Support
3249 #
3250 CONFIG_GRKERNSEC_SYSCTL=y
3251 @@ -6819,14 +7115,12 @@ CONFIG_SECURITYFS=y
3252 # CONFIG_INTEL_TXT is not set
3253 CONFIG_DEFAULT_SECURITY_DAC=y
3254 CONFIG_DEFAULT_SECURITY=""
3255 -CONFIG_XOR_BLOCKS=m
3256 +CONFIG_XOR_BLOCKS=y
3257 CONFIG_ASYNC_CORE=m
3258 CONFIG_ASYNC_MEMCPY=m
3259 CONFIG_ASYNC_XOR=m
3260 CONFIG_ASYNC_PQ=m
3261 CONFIG_ASYNC_RAID6_RECOV=m
3262 -CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
3263 -CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
3264 CONFIG_CRYPTO=y
3265
3266 #
3267 @@ -6879,6 +7173,7 @@ CONFIG_CRYPTO_XTS=m
3268 #
3269 # Hash modes
3270 #
3271 +CONFIG_CRYPTO_CMAC=m
3272 CONFIG_CRYPTO_HMAC=y
3273 CONFIG_CRYPTO_XCBC=m
3274 CONFIG_CRYPTO_VMAC=m
3275 @@ -6887,8 +7182,9 @@ CONFIG_CRYPTO_VMAC=m
3276 # Digest
3277 #
3278 CONFIG_CRYPTO_CRC32C=y
3279 -CONFIG_CRYPTO_CRC32C_X86_64=y
3280 CONFIG_CRYPTO_CRC32C_INTEL=y
3281 +CONFIG_CRYPTO_CRC32=m
3282 +CONFIG_CRYPTO_CRC32_PCLMUL=m
3283 CONFIG_CRYPTO_GHASH=m
3284 CONFIG_CRYPTO_MD4=m
3285 CONFIG_CRYPTO_MD5=y
3286 @@ -6899,6 +7195,8 @@ CONFIG_CRYPTO_RMD256=m
3287 CONFIG_CRYPTO_RMD320=m
3288 CONFIG_CRYPTO_SHA1=y
3289 CONFIG_CRYPTO_SHA1_SSSE3=m
3290 +CONFIG_CRYPTO_SHA256_SSSE3=m
3291 +CONFIG_CRYPTO_SHA512_SSSE3=m
3292 CONFIG_CRYPTO_SHA256=y
3293 CONFIG_CRYPTO_SHA512=y
3294 CONFIG_CRYPTO_TGR192=m
3295 @@ -6919,6 +7217,7 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m
3296 CONFIG_CRYPTO_CAMELLIA=m
3297 CONFIG_CRYPTO_CAMELLIA_X86_64=m
3298 CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
3299 +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
3300 CONFIG_CRYPTO_CAST_COMMON=m
3301 CONFIG_CRYPTO_CAST5=m
3302 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
3303 @@ -6933,6 +7232,7 @@ CONFIG_CRYPTO_SEED=m
3304 CONFIG_CRYPTO_SERPENT=m
3305 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
3306 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
3307 +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
3308 CONFIG_CRYPTO_TEA=m
3309 CONFIG_CRYPTO_TWOFISH=m
3310 CONFIG_CRYPTO_TWOFISH_COMMON=m
3311 @@ -6946,6 +7246,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
3312 CONFIG_CRYPTO_DEFLATE=m
3313 CONFIG_CRYPTO_ZLIB=m
3314 CONFIG_CRYPTO_LZO=y
3315 +CONFIG_CRYPTO_LZ4=m
3316 +CONFIG_CRYPTO_LZ4HC=m
3317
3318 #
3319 # Random Number Generation
3320 @@ -6964,6 +7266,7 @@ CONFIG_PUBLIC_KEY_ALGO_RSA=y
3321 CONFIG_X509_CERTIFICATE_PARSER=y
3322 CONFIG_HAVE_KVM=y
3323 CONFIG_HAVE_KVM_IRQCHIP=y
3324 +CONFIG_HAVE_KVM_IRQ_ROUTING=y
3325 CONFIG_HAVE_KVM_EVENTFD=y
3326 CONFIG_KVM_APIC_ARCHITECTURE=y
3327 CONFIG_KVM_MMIO=y
3328 @@ -6974,23 +7277,22 @@ CONFIG_VIRTUALIZATION=y
3329 CONFIG_KVM=m
3330 CONFIG_KVM_INTEL=m
3331 CONFIG_KVM_AMD=m
3332 -# CONFIG_KVM_MMU_AUDIT is not set
3333 -CONFIG_VHOST_NET=m
3334 -CONFIG_TCM_VHOST=m
3335 -CONFIG_BINARY_PRINTF=y
3336 +CONFIG_KVM_DEVICE_ASSIGNMENT=y
3337 +# CONFIG_BINARY_PRINTF is not set
3338
3339 #
3340 # Library routines
3341 #
3342 -CONFIG_RAID6_PQ=m
3343 +CONFIG_RAID6_PQ=y
3344 CONFIG_BITREVERSE=y
3345 +CONFIG_RATIONAL=y
3346 CONFIG_GENERIC_STRNCPY_FROM_USER=y
3347 CONFIG_GENERIC_STRNLEN_USER=y
3348 +CONFIG_GENERIC_NET_UTILS=y
3349 CONFIG_GENERIC_FIND_FIRST_BIT=y
3350 CONFIG_GENERIC_PCI_IOMAP=y
3351 CONFIG_GENERIC_IOMAP=y
3352 CONFIG_GENERIC_IO=y
3353 -CONFIG_PERCPU_RWSEM=y
3354 CONFIG_CRC_CCITT=m
3355 CONFIG_CRC16=y
3356 CONFIG_CRC_T10DIF=y
3357 @@ -7002,12 +7304,15 @@ CONFIG_CRC32_SLICEBY8=y
3358 # CONFIG_CRC32_SARWATE is not set
3359 # CONFIG_CRC32_BIT is not set
3360 CONFIG_CRC7=m
3361 -CONFIG_LIBCRC32C=m
3362 +CONFIG_LIBCRC32C=y
3363 CONFIG_CRC8=m
3364 CONFIG_ZLIB_INFLATE=y
3365 -CONFIG_ZLIB_DEFLATE=m
3366 +CONFIG_ZLIB_DEFLATE=y
3367 CONFIG_LZO_COMPRESS=y
3368 CONFIG_LZO_DECOMPRESS=y
3369 +CONFIG_LZ4_COMPRESS=m
3370 +CONFIG_LZ4HC_COMPRESS=m
3371 +CONFIG_LZ4_DECOMPRESS=y
3372 CONFIG_XZ_DEC=y
3373 CONFIG_XZ_DEC_X86=y
3374 CONFIG_XZ_DEC_POWERPC=y
3375 @@ -7022,6 +7327,7 @@ CONFIG_DECOMPRESS_BZIP2=y
3376 CONFIG_DECOMPRESS_LZMA=y
3377 CONFIG_DECOMPRESS_XZ=y
3378 CONFIG_DECOMPRESS_LZO=y
3379 +CONFIG_DECOMPRESS_LZ4=y
3380 CONFIG_GENERIC_ALLOCATOR=y
3381 CONFIG_REED_SOLOMON=m
3382 CONFIG_REED_SOLOMON_ENC8=y
3383 @@ -7049,3 +7355,8 @@ CONFIG_CORDIC=m
3384 CONFIG_DDR=y
3385 CONFIG_MPILIB=y
3386 CONFIG_OID_REGISTRY=y
3387 +CONFIG_UCS2_STRING=y
3388 +CONFIG_FONT_SUPPORT=y
3389 +# CONFIG_FONTS is not set
3390 +CONFIG_FONT_8x8=y
3391 +CONFIG_FONT_8x16=y
3392
3393 diff --git a/tools-uclibc/desktop/passwd.sh b/tools-uclibc/desktop/passwd.sh
3394 index fcd5759..058fb4b 100755
3395 --- a/tools-uclibc/desktop/passwd.sh
3396 +++ b/tools-uclibc/desktop/passwd.sh
3397 @@ -14,6 +14,8 @@ gpasswd -a gentoo cdrw
3398 gpasswd -a gentoo usb
3399 gpasswd -a gentoo games
3400
3401 +gpasswd -a portage wheel
3402 +
3403 echo gentoo:gentoo | chpasswd
3404
3405 groupadd -g 9995 graudit
3406
3407 diff --git a/tools-uclibc/desktop/portage/env/gdk-pixbuf.conf b/tools-uclibc/desktop/portage/env/gdk-pixbuf.conf
3408 new file mode 100644
3409 index 0000000..1b43095
3410 --- /dev/null
3411 +++ b/tools-uclibc/desktop/portage/env/gdk-pixbuf.conf
3412 @@ -0,0 +1 @@
3413 +MAKEOPTS="-j1"
3414
3415 diff --git a/tools-uclibc/desktop/portage/env/pygobject.conf b/tools-uclibc/desktop/portage/env/pygobject.conf
3416 new file mode 100644
3417 index 0000000..1b43095
3418 --- /dev/null
3419 +++ b/tools-uclibc/desktop/portage/env/pygobject.conf
3420 @@ -0,0 +1 @@
3421 +MAKEOPTS="-j1"
3422
3423 diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
3424 index a92d007..d5bb805 100644
3425 --- a/tools-uclibc/desktop/portage/make.conf.2
3426 +++ b/tools-uclibc/desktop/portage/make.conf.2
3427 @@ -14,7 +14,7 @@ USE_UDEV="gudev hwdb keymap kmod"
3428 USE_VCS="git"
3429 USE_CHAR="fontforge icu idn"
3430
3431 -USE_SERVERS="cups dbus sasl mbox"
3432 +USE_SERVERS="dbus sasl mbox"
3433 USE_PAX="xtpax -ptpax"
3434
3435 USE_AUDIO="openal"
3436
3437 diff --git a/tools-uclibc/desktop/portage/package.accept_keywords/ExtUtils-Manifest b/tools-uclibc/desktop/portage/package.accept_keywords/ExtUtils-Manifest
3438 new file mode 100644
3439 index 0000000..c4dc5e3
3440 --- /dev/null
3441 +++ b/tools-uclibc/desktop/portage/package.accept_keywords/ExtUtils-Manifest
3442 @@ -0,0 +1 @@
3443 +=perl-core/ExtUtils-Manifest-1.630.0 ~amd64
3444
3445 diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env
3446 index 3da8496..42a98df 100644
3447 --- a/tools-uclibc/desktop/portage/package.env
3448 +++ b/tools-uclibc/desktop/portage/package.env
3449 @@ -4,3 +4,5 @@ media-gfx/fontforge fontforge.conf
3450 media-libs/libquicktime libquicktime.conf
3451 media-video/ffmpeg ffmpeg.conf
3452 sys-apps/coreutils coreutils.conf
3453 +x11-libs/gdk-pixbuf gdk-pixbuf.conf
3454 +dev-python/pygobject pygobject.conf
3455
3456 diff --git a/tools-uclibc/desktop/portage/package.mask/openntpd b/tools-uclibc/desktop/portage/package.mask/openntpd
3457 deleted file mode 100644
3458 index f97d893..0000000
3459 --- a/tools-uclibc/desktop/portage/package.mask/openntpd
3460 +++ /dev/null
3461 @@ -1 +0,0 @@
3462 -=net-misc/openntpd-20080406
3463
3464 diff --git a/tools-uclibc/desktop/portage/package.use/DirectFB b/tools-uclibc/desktop/portage/package.use/DirectFB
3465 new file mode 100644
3466 index 0000000..ef9bbd5
3467 --- /dev/null
3468 +++ b/tools-uclibc/desktop/portage/package.use/DirectFB
3469 @@ -0,0 +1 @@
3470 +dev-libs/DirectFB -sdl
3471
3472 diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
3473 index a71ce0a..d204618 100755
3474 --- a/tools-uclibc/desktop/run.sh
3475 +++ b/tools-uclibc/desktop/run.sh
3476 @@ -52,7 +52,7 @@ rebuild_toolchain() {
3477
3478 rebuild_world() {
3479 cp -f portage/make.conf.2 "${ROOTFS}"/etc/portage/make.conf
3480 - cp -f world "${ROOTFS}"/var/lib/portage/world
3481 + cp -f world.1 "${ROOTFS}"/var/lib/portage/world
3482 cp -f rebuild.sh "${ROOTFS}"/tmp/
3483 chroot "${ROOTFS}"/ /tmp/rebuild.sh
3484 rm -f "${ROOTFS}"/tmp/rebuild.sh
3485 @@ -61,6 +61,8 @@ rebuild_world() {
3486
3487 update_world() {
3488 cp -f portage/make.conf.3 "${ROOTFS}"/etc/portage/make.conf
3489 + cp -f world.2 "${ROOTFS}"/var/lib/portage/world
3490 +
3491 cp -f update.sh "${ROOTFS}"/tmp/
3492 chroot "${ROOTFS}"/ /tmp/update.sh
3493 rm -f "${ROOTFS}"/tmp/update.sh
3494 @@ -128,6 +130,9 @@ setup_confs() {
3495 sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf
3496 sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
3497 sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf
3498 +
3499 + # In kernels 3.9 and above, we must disallow-other-stacks because of SO_REUSEPORT
3500 + sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' "${ROOTFS}"/etc/avahi/avahi-daemon.conf
3501 }
3502
3503 cleanup_dirs() {
3504 @@ -143,6 +148,9 @@ unmount_dirs() {
3505 umount "${ROOTFS}"/dev/
3506 umount "${ROOTFS}"/proc/
3507 umount "${ROOTFS}"/usr/portage/
3508 +
3509 + mkdir "${ROOTFS}"/usr/portage/profiles/
3510 + echo "gentoo" >> "${ROOTFS}"/usr/portage/profiles/repo_name
3511 }
3512
3513 bundle_it() {
3514
3515 diff --git a/tools-uclibc/desktop/update.sh b/tools-uclibc/desktop/update.sh
3516 index 1920e72..434d47f 100755
3517 --- a/tools-uclibc/desktop/update.sh
3518 +++ b/tools-uclibc/desktop/update.sh
3519 @@ -2,4 +2,7 @@
3520
3521 source /etc/profile
3522 env-update
3523 +#hacky - for some reason cairo fails to rebuild
3524 +#unless binutils is rebuilt first.
3525 +emerge -q binutils
3526 emerge -uvNDq world
3527
3528 diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world.1
3529 similarity index 96%
3530 copy from tools-uclibc/desktop/world
3531 copy to tools-uclibc/desktop/world.1
3532 index c842297..72c3c91 100644
3533 --- a/tools-uclibc/desktop/world
3534 +++ b/tools-uclibc/desktop/world.1
3535 @@ -5,7 +5,6 @@ app-editors/gedit
3536 app-editors/nano
3537 app-editors/vim
3538 app-office/abiword
3539 -app-office/gnumeric
3540 app-portage/gentoolkit
3541 app-portage/layman
3542 app-text/evince
3543 @@ -24,7 +23,6 @@ gnome-extra/gnome-system-monitor
3544 mail-client/claws-mail
3545 mail-client/mailx
3546 mail-mta/postfix
3547 -media-gfx/eog
3548 media-gfx/gimp
3549 media-sound/alsa-utils
3550 media-video/smplayer
3551 @@ -59,7 +57,6 @@ sys-libs/cracklib
3552 sys-libs/db
3553 sys-libs/gdbm
3554 sys-libs/uclibc
3555 -sys-process/fcron
3556 sys-process/lsof
3557 virtual/libiconv
3558 virtual/libintl
3559
3560 diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world.2
3561 similarity index 100%
3562 rename from tools-uclibc/desktop/world
3563 rename to tools-uclibc/desktop/world.2