Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] releng r695 - in trunk/releases/10.0: kconfig/amd64 kconfig/x86 livecd/root_overlay livecd/root_overlay/etc livecd/root_overlay/etc/env.d portage/package.keywords specs/amd64 specs/x86/i686
Date: Fri, 11 Sep 2009 00:46:54
Message-Id: E1MluHn-0006dq-IF@stork.gentoo.org
1 Author: jmbsvicetto
2 Date: 2009-09-11 00:46:47 +0000 (Fri, 11 Sep 2009)
3 New Revision: 695
4
5 Added:
6 trunk/releases/10.0/livecd/root_overlay/etc/
7 trunk/releases/10.0/livecd/root_overlay/etc/env.d/
8 trunk/releases/10.0/livecd/root_overlay/etc/env.d/90xsession
9 Modified:
10 trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config
11 trunk/releases/10.0/kconfig/x86/installcd-2.6.30.config
12 trunk/releases/10.0/portage/package.keywords/kde-4.3.keywords
13 trunk/releases/10.0/portage/package.keywords/keywords
14 trunk/releases/10.0/specs/amd64/livedvd-stage1.spec
15 trunk/releases/10.0/specs/amd64/livedvd-stage2.spec
16 trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec
17 trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec
18 Log:
19 More updates from likewhoa. Added session file for KDE-4.3 session.
20
21
22 Modified: trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config
23 ===================================================================
24 --- trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config 2009-09-09 16:58:27 UTC (rev 694)
25 +++ trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config 2009-09-11 00:46:47 UTC (rev 695)
26 @@ -1,7 +1,7 @@
27 #
28 # Automatically generated make config: don't edit
29 -# Linux kernel version: 2.6.30-gentoo-r6
30 -# Thu Sep 3 21:20:46 2009
31 +# Linux kernel version: 2.6.28-gentoo-r5
32 +# Sun May 3 16:45:22 2009
33 #
34 CONFIG_64BIT=y
35 # CONFIG_X86_32 is not set
36 @@ -22,7 +22,6 @@
37 CONFIG_GENERIC_ISA_DMA=y
38 CONFIG_GENERIC_IOMAP=y
39 CONFIG_GENERIC_BUG=y
40 -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
41 CONFIG_GENERIC_HWEIGHT=y
42 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
43 CONFIG_RWSEM_GENERIC_SPINLOCK=y
44 @@ -34,7 +33,6 @@
45 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
46 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
47 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
48 -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
49 CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
50 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
51 CONFIG_ARCH_SUSPEND_POSSIBLE=y
52 @@ -42,14 +40,14 @@
53 CONFIG_ARCH_POPULATES_NODE_MAP=y
54 CONFIG_AUDIT_ARCH=y
55 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
56 -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
57 CONFIG_GENERIC_HARDIRQS=y
58 -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
59 CONFIG_GENERIC_IRQ_PROBE=y
60 CONFIG_GENERIC_PENDING_IRQ=y
61 +CONFIG_X86_SMP=y
62 CONFIG_USE_GENERIC_SMP_HELPERS=y
63 CONFIG_X86_64_SMP=y
64 CONFIG_X86_HT=y
65 +CONFIG_X86_BIOS_REBOOT=y
66 CONFIG_X86_TRAMPOLINE=y
67 # CONFIG_KTIME_SCALAR is not set
68 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
69 @@ -62,12 +60,6 @@
70 CONFIG_INIT_ENV_ARG_LIMIT=32
71 CONFIG_LOCALVERSION=""
72 # CONFIG_LOCALVERSION_AUTO is not set
73 -CONFIG_HAVE_KERNEL_GZIP=y
74 -CONFIG_HAVE_KERNEL_BZIP2=y
75 -CONFIG_HAVE_KERNEL_LZMA=y
76 -CONFIG_KERNEL_GZIP=y
77 -# CONFIG_KERNEL_BZIP2 is not set
78 -# CONFIG_KERNEL_LZMA is not set
79 CONFIG_SWAP=y
80 CONFIG_SYSVIPC=y
81 CONFIG_SYSVIPC_SYSCTL=y
82 @@ -75,38 +67,27 @@
83 # CONFIG_BSD_PROCESS_ACCT is not set
84 # CONFIG_TASKSTATS is not set
85 # CONFIG_AUDIT is not set
86 -
87 -#
88 -# RCU Subsystem
89 -#
90 -CONFIG_CLASSIC_RCU=y
91 -# CONFIG_TREE_RCU is not set
92 -# CONFIG_PREEMPT_RCU is not set
93 -# CONFIG_TREE_RCU_TRACE is not set
94 -# CONFIG_PREEMPT_RCU_TRACE is not set
95 CONFIG_IKCONFIG=y
96 CONFIG_IKCONFIG_PROC=y
97 CONFIG_LOG_BUF_SHIFT=15
98 +# CONFIG_CGROUPS is not set
99 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
100 # CONFIG_GROUP_SCHED is not set
101 -# CONFIG_CGROUPS is not set
102 -# CONFIG_SYSFS_DEPRECATED_V2 is not set
103 +CONFIG_SYSFS_DEPRECATED=y
104 +CONFIG_SYSFS_DEPRECATED_V2=y
105 # CONFIG_RELAY is not set
106 # CONFIG_NAMESPACES is not set
107 CONFIG_BLK_DEV_INITRD=y
108 CONFIG_INITRAMFS_SOURCE=""
109 -CONFIG_RD_GZIP=y
110 -# CONFIG_RD_BZIP2 is not set
111 -# CONFIG_RD_LZMA is not set
112 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
113 CONFIG_SYSCTL=y
114 CONFIG_ANON_INODES=y
115 CONFIG_EMBEDDED=y
116 +# CONFIG_UID16 is not set
117 CONFIG_SYSCTL_SYSCALL=y
118 CONFIG_KALLSYMS=y
119 # CONFIG_KALLSYMS_ALL is not set
120 # CONFIG_KALLSYMS_EXTRA_PASS is not set
121 -# CONFIG_STRIP_ASM_SYMS is not set
122 CONFIG_HOTPLUG=y
123 CONFIG_PRINTK=y
124 CONFIG_BUG=y
125 @@ -135,11 +116,10 @@
126 CONFIG_HAVE_KPROBES=y
127 CONFIG_HAVE_KRETPROBES=y
128 CONFIG_HAVE_ARCH_TRACEHOOK=y
129 -CONFIG_HAVE_DMA_API_DEBUG=y
130 -# CONFIG_SLOW_WORK is not set
131 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132 CONFIG_SLABINFO=y
133 CONFIG_RT_MUTEXES=y
134 +# CONFIG_TINY_SHMEM is not set
135 CONFIG_BASE_SMALL=0
136 CONFIG_MODULES=y
137 # CONFIG_MODULE_FORCE_LOAD is not set
138 @@ -147,10 +127,13 @@
139 # CONFIG_MODULE_FORCE_UNLOAD is not set
140 CONFIG_MODVERSIONS=y
141 # CONFIG_MODULE_SRCVERSION_ALL is not set
142 +CONFIG_KMOD=y
143 CONFIG_STOP_MACHINE=y
144 CONFIG_BLOCK=y
145 +# CONFIG_BLK_DEV_IO_TRACE is not set
146 CONFIG_BLK_DEV_BSG=y
147 # CONFIG_BLK_DEV_INTEGRITY is not set
148 +CONFIG_BLOCK_COMPAT=y
149
150 #
151 # IO Schedulers
152 @@ -164,6 +147,7 @@
153 # CONFIG_DEFAULT_CFQ is not set
154 # CONFIG_DEFAULT_NOOP is not set
155 CONFIG_DEFAULT_IOSCHED="deadline"
156 +CONFIG_CLASSIC_RCU=y
157 # CONFIG_FREEZER is not set
158
159 #
160 @@ -173,11 +157,13 @@
161 # CONFIG_HIGH_RES_TIMERS is not set
162 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
163 CONFIG_SMP=y
164 -# CONFIG_SPARSE_IRQ is not set
165 +CONFIG_X86_FIND_SMP_CONFIG=y
166 CONFIG_X86_MPPARSE=y
167 -CONFIG_X86_EXTENDED_PLATFORM=y
168 +CONFIG_X86_PC=y
169 +# CONFIG_X86_ELAN is not set
170 +# CONFIG_X86_VOYAGER is not set
171 +# CONFIG_X86_GENERICARCH is not set
172 # CONFIG_X86_VSMP is not set
173 -CONFIG_SCHED_OMIT_FRAME_POINTER=y
174 # CONFIG_PARAVIRT_GUEST is not set
175 # CONFIG_MEMTEST is not set
176 # CONFIG_M386 is not set
177 @@ -206,10 +192,10 @@
178 # CONFIG_MCORE2 is not set
179 CONFIG_GENERIC_CPU=y
180 CONFIG_X86_CPU=y
181 -CONFIG_X86_L1_CACHE_BYTES=64
182 -CONFIG_X86_INTERNODE_CACHE_BYTES=64
183 +CONFIG_X86_L1_CACHE_BYTES=128
184 +CONFIG_X86_INTERNODE_CACHE_BYTES=128
185 CONFIG_X86_CMPXCHG=y
186 -CONFIG_X86_L1_CACHE_SHIFT=6
187 +CONFIG_X86_L1_CACHE_SHIFT=7
188 CONFIG_X86_WP_WORKS_OK=y
189 CONFIG_X86_TSC=y
190 CONFIG_X86_CMPXCHG64=y
191 @@ -219,7 +205,7 @@
192 # CONFIG_PROCESSOR_SELECT is not set
193 CONFIG_CPU_SUP_INTEL=y
194 CONFIG_CPU_SUP_AMD=y
195 -CONFIG_CPU_SUP_CENTAUR=y
196 +CONFIG_CPU_SUP_CENTAUR_64=y
197 # CONFIG_X86_DS is not set
198 CONFIG_HPET_TIMER=y
199 CONFIG_HPET_EMULATE_RTC=y
200 @@ -229,9 +215,7 @@
201 # CONFIG_AMD_IOMMU is not set
202 CONFIG_SWIOTLB=y
203 CONFIG_IOMMU_HELPER=y
204 -# CONFIG_IOMMU_API is not set
205 -# CONFIG_MAXSMP is not set
206 -CONFIG_NR_CPUS=16
207 +CONFIG_NR_CPUS=64
208 CONFIG_SCHED_SMT=y
209 CONFIG_SCHED_MC=y
210 CONFIG_PREEMPT_NONE=y
211 @@ -239,18 +223,14 @@
212 # CONFIG_PREEMPT is not set
213 CONFIG_X86_LOCAL_APIC=y
214 CONFIG_X86_IO_APIC=y
215 -# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
216 CONFIG_X86_MCE=y
217 CONFIG_X86_MCE_INTEL=y
218 CONFIG_X86_MCE_AMD=y
219 -CONFIG_X86_MCE_THRESHOLD=y
220 CONFIG_I8K=m
221 # CONFIG_MICROCODE is not set
222 # CONFIG_X86_MSR is not set
223 # CONFIG_X86_CPUID is not set
224 -# CONFIG_X86_CPU_DEBUG is not set
225 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
226 -CONFIG_DIRECT_GBPAGES=y
227 # CONFIG_NUMA is not set
228 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
229 CONFIG_ARCH_SPARSEMEM_ENABLE=y
230 @@ -267,14 +247,12 @@
231 # CONFIG_MEMORY_HOTPLUG is not set
232 CONFIG_PAGEFLAGS_EXTENDED=y
233 CONFIG_SPLIT_PTLOCK_CPUS=4
234 +CONFIG_RESOURCES_64BIT=y
235 CONFIG_PHYS_ADDR_T_64BIT=y
236 CONFIG_ZONE_DMA_FLAG=1
237 CONFIG_BOUNCE=y
238 CONFIG_VIRT_TO_BUS=y
239 CONFIG_UNEVICTABLE_LRU=y
240 -CONFIG_HAVE_MLOCK=y
241 -CONFIG_HAVE_MLOCKED_PAGE_BIT=y
242 -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
243 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
244 CONFIG_X86_RESERVE_LOW_64K=y
245 CONFIG_MTRR=y
246 @@ -282,7 +260,6 @@
247 # CONFIG_X86_PAT is not set
248 CONFIG_EFI=y
249 CONFIG_SECCOMP=y
250 -# CONFIG_CC_STACKPROTECTOR is not set
251 CONFIG_HZ_100=y
252 # CONFIG_HZ_250 is not set
253 # CONFIG_HZ_300 is not set
254 @@ -291,10 +268,11 @@
255 # CONFIG_SCHED_HRTICK is not set
256 # CONFIG_KEXEC is not set
257 # CONFIG_CRASH_DUMP is not set
258 -CONFIG_PHYSICAL_START=0x2000000
259 +CONFIG_PHYSICAL_START=0x200000
260 CONFIG_RELOCATABLE=y
261 CONFIG_PHYSICAL_ALIGN=0x200000
262 # CONFIG_HOTPLUG_CPU is not set
263 +# CONFIG_COMPAT_VDSO is not set
264 # CONFIG_CMDLINE_BOOL is not set
265 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
266
267 @@ -309,7 +287,7 @@
268 # CONFIG_ACPI_PROCFS is not set
269 # CONFIG_ACPI_PROCFS_POWER is not set
270 CONFIG_ACPI_SYSFS_POWER=y
271 -# CONFIG_ACPI_PROC_EVENT is not set
272 +CONFIG_ACPI_PROC_EVENT=y
273 CONFIG_ACPI_AC=m
274 CONFIG_ACPI_BATTERY=m
275 CONFIG_ACPI_BUTTON=m
276 @@ -318,13 +296,17 @@
277 CONFIG_ACPI_DOCK=y
278 CONFIG_ACPI_PROCESSOR=m
279 CONFIG_ACPI_THERMAL=m
280 +# CONFIG_ACPI_WMI is not set
281 +CONFIG_ACPI_ASUS=m
282 +CONFIG_ACPI_TOSHIBA=m
283 # CONFIG_ACPI_CUSTOM_DSDT is not set
284 CONFIG_ACPI_BLACKLIST_YEAR=0
285 # CONFIG_ACPI_DEBUG is not set
286 # CONFIG_ACPI_PCI_SLOT is not set
287 +CONFIG_ACPI_SYSTEM=y
288 # CONFIG_X86_PM_TIMER is not set
289 CONFIG_ACPI_CONTAINER=m
290 -CONFIG_ACPI_SBS=m
291 +# CONFIG_ACPI_SBS is not set
292
293 #
294 # CPU Frequency scaling
295 @@ -350,12 +332,14 @@
296 #
297 CONFIG_X86_ACPI_CPUFREQ=m
298 CONFIG_X86_POWERNOW_K8=m
299 -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
300 +CONFIG_X86_POWERNOW_K8_ACPI=y
301 +CONFIG_X86_SPEEDSTEP_CENTRINO=m
302 CONFIG_X86_P4_CLOCKMOD=m
303
304 #
305 # shared options
306 #
307 +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
308 CONFIG_X86_SPEEDSTEP_LIB=m
309 CONFIG_CPU_IDLE=y
310 CONFIG_CPU_IDLE_GOV_LADDER=y
311 @@ -379,9 +363,7 @@
312 # CONFIG_PCI_MSI is not set
313 CONFIG_PCI_LEGACY=y
314 # CONFIG_PCI_DEBUG is not set
315 -# CONFIG_PCI_STUB is not set
316 CONFIG_HT_IRQ=y
317 -# CONFIG_PCI_IOV is not set
318 CONFIG_ISA_DMA_API=y
319 CONFIG_K8_NB=y
320 CONFIG_PCCARD=m
321 @@ -409,11 +391,15 @@
322 # Executable file formats / Emulations
323 #
324 CONFIG_BINFMT_ELF=y
325 +CONFIG_COMPAT_BINFMT_ELF=y
326 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
327 # CONFIG_HAVE_AOUT is not set
328 # CONFIG_BINFMT_MISC is not set
329 -# CONFIG_IA32_EMULATION is not set
330 -# CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set
331 +CONFIG_IA32_EMULATION=y
332 +CONFIG_IA32_AOUT=y
333 +CONFIG_COMPAT=y
334 +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
335 +CONFIG_SYSVIPC_COMPAT=y
336 CONFIG_NET=y
337
338 #
339 @@ -450,7 +436,7 @@
340 CONFIG_INET_XFRM_MODE_TRANSPORT=m
341 CONFIG_INET_XFRM_MODE_TUNNEL=m
342 CONFIG_INET_XFRM_MODE_BEET=m
343 -CONFIG_INET_LRO=y
344 +CONFIG_INET_LRO=m
345 # CONFIG_INET_DIAG is not set
346 # CONFIG_TCP_CONG_ADVANCED is not set
347 CONFIG_TCP_CONG_CUBIC=y
348 @@ -484,7 +470,6 @@
349 # CONFIG_SCTP_HMAC_NONE is not set
350 # CONFIG_SCTP_HMAC_SHA1 is not set
351 CONFIG_SCTP_HMAC_MD5=y
352 -# CONFIG_RDS is not set
353 # CONFIG_TIPC is not set
354 CONFIG_ATM=m
355 CONFIG_ATM_CLIP=m
356 @@ -505,9 +490,7 @@
357 # CONFIG_LAPB is not set
358 # CONFIG_ECONET is not set
359 # CONFIG_WAN_ROUTER is not set
360 -# CONFIG_PHONET is not set
361 # CONFIG_NET_SCHED is not set
362 -# CONFIG_DCB is not set
363
364 #
365 # Network testing
366 @@ -524,13 +507,14 @@
367 CONFIG_BT_BNEP=m
368 CONFIG_BT_BNEP_MC_FILTER=y
369 CONFIG_BT_BNEP_PROTO_FILTER=y
370 -# CONFIG_BT_CMTP is not set
371 CONFIG_BT_HIDP=m
372
373 #
374 # Bluetooth device drivers
375 #
376 -CONFIG_BT_HCIBTUSB=m
377 +CONFIG_BT_HCIUSB=m
378 +CONFIG_BT_HCIUSB_SCO=y
379 +# CONFIG_BT_HCIBTUSB is not set
380 CONFIG_BT_HCIUART=m
381 CONFIG_BT_HCIUART_H4=y
382 CONFIG_BT_HCIUART_BCSP=y
383 @@ -544,17 +528,13 @@
384 CONFIG_BT_HCIBTUART=m
385 CONFIG_BT_HCIVHCI=m
386 # CONFIG_AF_RXRPC is not set
387 +# CONFIG_PHONET is not set
388 CONFIG_WIRELESS=y
389 CONFIG_CFG80211=m
390 -# CONFIG_CFG80211_REG_DEBUG is not set
391 +# CONFIG_NL80211 is not set
392 CONFIG_WIRELESS_OLD_REGULATORY=y
393 CONFIG_WIRELESS_EXT=y
394 CONFIG_WIRELESS_EXT_SYSFS=y
395 -CONFIG_LIB80211=m
396 -CONFIG_LIB80211_CRYPT_WEP=m
397 -CONFIG_LIB80211_CRYPT_CCMP=m
398 -CONFIG_LIB80211_CRYPT_TKIP=m
399 -# CONFIG_LIB80211_DEBUG is not set
400 CONFIG_MAC80211=m
401
402 #
403 @@ -568,7 +548,11 @@
404 # CONFIG_MAC80211_MESH is not set
405 CONFIG_MAC80211_LEDS=y
406 # CONFIG_MAC80211_DEBUG_MENU is not set
407 -# CONFIG_WIMAX is not set
408 +CONFIG_IEEE80211=m
409 +# CONFIG_IEEE80211_DEBUG is not set
410 +CONFIG_IEEE80211_CRYPT_WEP=m
411 +CONFIG_IEEE80211_CRYPT_CCMP=m
412 +CONFIG_IEEE80211_CRYPT_TKIP=m
413 CONFIG_RFKILL=m
414 CONFIG_RFKILL_INPUT=m
415 CONFIG_RFKILL_LEDS=y
416 @@ -624,30 +608,38 @@
417 CONFIG_MISC_DEVICES=y
418 # CONFIG_IBM_ASM is not set
419 # CONFIG_PHANTOM is not set
420 +CONFIG_EEPROM_93CX6=m
421 # CONFIG_SGI_IOC4 is not set
422 # CONFIG_TIFM_CORE is not set
423 +# CONFIG_ACER_WMI is not set
424 +# CONFIG_ASUS_LAPTOP is not set
425 +CONFIG_FUJITSU_LAPTOP=m
426 +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
427 # CONFIG_ICS932S401 is not set
428 +CONFIG_MSI_LAPTOP=m
429 +# CONFIG_PANASONIC_LAPTOP is not set
430 +# CONFIG_COMPAL_LAPTOP is not set
431 +CONFIG_SONY_LAPTOP=m
432 +CONFIG_SONYPI_COMPAT=y
433 +CONFIG_THINKPAD_ACPI=m
434 +# CONFIG_THINKPAD_ACPI_DEBUG is not set
435 +CONFIG_THINKPAD_ACPI_BAY=y
436 +CONFIG_THINKPAD_ACPI_VIDEO=y
437 +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
438 +# CONFIG_INTEL_MENLOW is not set
439 +CONFIG_EEEPC_LAPTOP=m
440 # CONFIG_ENCLOSURE_SERVICES is not set
441 +# CONFIG_SGI_XP is not set
442 # CONFIG_HP_ILO is not set
443 -# CONFIG_DELL_LAPTOP is not set
444 -# CONFIG_ISL29003 is not set
445 +# CONFIG_SGI_GRU is not set
446 # CONFIG_C2PORT is not set
447 -
448 -#
449 -# EEPROM support
450 -#
451 -# CONFIG_EEPROM_AT24 is not set
452 -# CONFIG_EEPROM_LEGACY is not set
453 -CONFIG_EEPROM_93CX6=m
454 CONFIG_HAVE_IDE=y
455 CONFIG_IDE=y
456
457 #
458 # Please see Documentation/ide/ide.txt for help/info on IDE drives
459 #
460 -CONFIG_IDE_XFER_MODE=y
461 CONFIG_IDE_TIMINGS=y
462 -CONFIG_IDE_ATAPI=y
463 # CONFIG_BLK_DEV_IDE_SATA is not set
464 CONFIG_IDE_GD=y
465 CONFIG_IDE_GD_ATA=y
466 @@ -657,6 +649,7 @@
467 CONFIG_BLK_DEV_IDECD=y
468 CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
469 # CONFIG_BLK_DEV_IDETAPE is not set
470 +# CONFIG_BLK_DEV_IDESCSI is not set
471 CONFIG_BLK_DEV_IDEACPI=y
472 CONFIG_IDE_TASK_IOCTL=y
473 CONFIG_IDE_PROC_FS=y
474 @@ -693,7 +686,6 @@
475 CONFIG_BLK_DEV_JMICRON=y
476 CONFIG_BLK_DEV_SC1200=y
477 CONFIG_BLK_DEV_PIIX=y
478 -# CONFIG_BLK_DEV_IT8172 is not set
479 # CONFIG_BLK_DEV_IT8213 is not set
480 CONFIG_BLK_DEV_IT821X=y
481 CONFIG_BLK_DEV_NS87415=y
482 @@ -754,7 +746,6 @@
483 CONFIG_SCSI_SRP_TGT_ATTRS=y
484 CONFIG_SCSI_LOWLEVEL=y
485 CONFIG_ISCSI_TCP=y
486 -# CONFIG_SCSI_CXGB3_ISCSI is not set
487 CONFIG_BLK_DEV_3W_XXXX_RAID=m
488 CONFIG_SCSI_3W_9XXX=m
489 CONFIG_SCSI_ACARD=m
490 @@ -783,13 +774,8 @@
491 CONFIG_MEGARAID_MAILBOX=m
492 CONFIG_MEGARAID_LEGACY=m
493 CONFIG_MEGARAID_SAS=m
494 -# CONFIG_SCSI_MPT2SAS is not set
495 CONFIG_SCSI_HPTIOP=m
496 CONFIG_SCSI_BUSLOGIC=m
497 -# CONFIG_LIBFC is not set
498 -# CONFIG_LIBFCOE is not set
499 -# CONFIG_FCOE is not set
500 -# CONFIG_FCOE_FNIC is not set
501 CONFIG_SCSI_DMX3191D=m
502 CONFIG_SCSI_EATA=m
503 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
504 @@ -823,7 +809,6 @@
505 CONFIG_PCMCIA_QLOGIC=m
506 CONFIG_PCMCIA_SYM53C500=m
507 # CONFIG_SCSI_DH is not set
508 -# CONFIG_SCSI_OSD_INITIATOR is not set
509 CONFIG_ATA=m
510 # CONFIG_ATA_NONSTANDARD is not set
511 CONFIG_ATA_ACPI=y
512 @@ -854,7 +839,7 @@
513 CONFIG_PATA_CMD64X=m
514 CONFIG_PATA_CS5520=m
515 CONFIG_PATA_CS5530=m
516 -CONFIG_PATA_CYPRESS=m
517 +# CONFIG_PATA_CYPRESS is not set
518 CONFIG_PATA_EFAR=m
519 CONFIG_ATA_GENERIC=m
520 CONFIG_PATA_HPT366=m
521 @@ -870,7 +855,7 @@
522 CONFIG_PATA_MPIIX=m
523 # CONFIG_PATA_OLDPIIX is not set
524 CONFIG_PATA_NETCELL=m
525 -CONFIG_PATA_NINJA32=m
526 +# CONFIG_PATA_NINJA32 is not set
527 CONFIG_PATA_NS87410=m
528 CONFIG_PATA_NS87415=m
529 CONFIG_PATA_OPTI=m
530 @@ -896,7 +881,7 @@
531 CONFIG_MD_RAID1=m
532 CONFIG_MD_RAID10=m
533 CONFIG_MD_RAID456=m
534 -CONFIG_MD_RAID6_PQ=m
535 +CONFIG_MD_RAID5_RESHAPE=y
536 CONFIG_MD_MULTIPATH=m
537 CONFIG_MD_FAULTY=m
538 CONFIG_BLK_DEV_DM=m
539 @@ -950,7 +935,6 @@
540 CONFIG_MACINTOSH_DRIVERS=y
541 CONFIG_MAC_EMUMOUSEBTN=y
542 CONFIG_NETDEVICES=y
543 -CONFIG_COMPAT_NET_DEV_OPS=y
544 # CONFIG_DUMMY is not set
545 CONFIG_BONDING=m
546 # CONFIG_MACVLAN is not set
547 @@ -974,9 +958,6 @@
548 CONFIG_BROADCOM_PHY=m
549 CONFIG_ICPLUS_PHY=m
550 CONFIG_REALTEK_PHY=m
551 -# CONFIG_NATIONAL_PHY is not set
552 -# CONFIG_STE10XP is not set
553 -# CONFIG_LSI_ET1011C_PHY is not set
554 CONFIG_MDIO_BITBANG=m
555 CONFIG_NET_ETHERNET=y
556 CONFIG_MII=y
557 @@ -986,8 +967,6 @@
558 CONFIG_NET_VENDOR_3COM=y
559 CONFIG_VORTEX=m
560 CONFIG_TYPHOON=m
561 -CONFIG_ETHOC=m
562 -CONFIG_DNET=m
563 CONFIG_NET_TULIP=y
564 CONFIG_DE2104X=m
565 CONFIG_TULIP=m
566 @@ -1018,6 +997,7 @@
567 CONFIG_B44_PCI=y
568 CONFIG_FORCEDETH=m
569 CONFIG_FORCEDETH_NAPI=y
570 +CONFIG_EEPRO100=m
571 CONFIG_E100=m
572 CONFIG_FEALNX=m
573 CONFIG_NATSEMI=m
574 @@ -1028,10 +1008,9 @@
575 CONFIG_8139TOO_TUNE_TWISTER=y
576 CONFIG_8139TOO_8129=y
577 # CONFIG_8139_OLD_RX_RESET is not set
578 -CONFIG_R6040=m
579 +# CONFIG_R6040 is not set
580 CONFIG_SIS900=m
581 CONFIG_EPIC100=m
582 -CONFIG_SMSC9420=m
583 CONFIG_SUNDANCE=m
584 CONFIG_SUNDANCE_MMIO=y
585 CONFIG_TLAN=m
586 @@ -1047,8 +1026,8 @@
587 CONFIG_E1000E=m
588 CONFIG_IP1000=m
589 CONFIG_IGB=m
590 +# CONFIG_IGB_LRO is not set
591 CONFIG_IGB_DCA=y
592 -# CONFIG_IGBVF is not set
593 CONFIG_NS83820=m
594 CONFIG_HAMACHI=m
595 CONFIG_YELLOWFIN=m
596 @@ -1063,19 +1042,16 @@
597 CONFIG_QLA3XXX=m
598 CONFIG_ATL1=m
599 CONFIG_ATL1E=m
600 -# CONFIG_ATL1C is not set
601 CONFIG_JME=y
602 CONFIG_NETDEV_10000=y
603 CONFIG_CHELSIO_T1=m
604 CONFIG_CHELSIO_T1_1G=y
605 -CONFIG_CHELSIO_T3_DEPENDS=y
606 CONFIG_CHELSIO_T3=m
607 # CONFIG_ENIC is not set
608 CONFIG_IXGBE=m
609 CONFIG_IXGBE_DCA=y
610 CONFIG_IXGB=m
611 CONFIG_S2IO=m
612 -# CONFIG_VXGE is not set
613 CONFIG_MYRI10GE=m
614 CONFIG_MYRI10GE_DCA=y
615 CONFIG_NETXEN_NIC=m
616 @@ -1087,7 +1063,6 @@
617 CONFIG_BNX2X=m
618 # CONFIG_QLGE is not set
619 CONFIG_SFC=m
620 -# CONFIG_BE2NET is not set
621 # CONFIG_TR is not set
622
623 #
624 @@ -1096,16 +1071,31 @@
625 # CONFIG_WLAN_PRE80211 is not set
626 CONFIG_WLAN_80211=y
627 # CONFIG_PCMCIA_RAYCS is not set
628 +CONFIG_IPW2100=m
629 +CONFIG_IPW2100_MONITOR=y
630 +# CONFIG_IPW2100_DEBUG is not set
631 +CONFIG_IPW2200=m
632 +CONFIG_IPW2200_MONITOR=y
633 +CONFIG_IPW2200_RADIOTAP=y
634 +CONFIG_IPW2200_PROMISCUOUS=y
635 +CONFIG_IPW2200_QOS=y
636 +# CONFIG_IPW2200_DEBUG is not set
637 CONFIG_LIBERTAS=m
638 CONFIG_LIBERTAS_USB=m
639 CONFIG_LIBERTAS_CS=m
640 # CONFIG_LIBERTAS_DEBUG is not set
641 # CONFIG_LIBERTAS_THINFIRM is not set
642 CONFIG_AIRO=m
643 +CONFIG_HERMES=m
644 +CONFIG_PLX_HERMES=m
645 +CONFIG_TMD_HERMES=m
646 +CONFIG_NORTEL_HERMES=m
647 +CONFIG_PCI_HERMES=m
648 +CONFIG_PCMCIA_HERMES=m
649 +CONFIG_PCMCIA_SPECTRUM=m
650 CONFIG_ATMEL=m
651 CONFIG_PCI_ATMEL=m
652 CONFIG_PCMCIA_ATMEL=m
653 -# CONFIG_AT76C50X_USB is not set
654 CONFIG_AIRO_CS=m
655 CONFIG_PCMCIA_WL3501=m
656 CONFIG_PRISM54=m
657 @@ -1115,37 +1105,27 @@
658 CONFIG_RTL8187=m
659 CONFIG_ADM8211=m
660 # CONFIG_MAC80211_HWSIM is not set
661 -# CONFIG_MWL8K is not set
662 CONFIG_P54_COMMON=m
663 CONFIG_P54_USB=m
664 CONFIG_P54_PCI=m
665 -CONFIG_P54_LEDS=y
666 CONFIG_ATH5K=m
667 # CONFIG_ATH5K_DEBUG is not set
668 CONFIG_ATH9K=m
669 -# CONFIG_ATH9K_DEBUG is not set
670 -# CONFIG_AR9170_USB is not set
671 -CONFIG_IPW2100=m
672 -CONFIG_IPW2100_MONITOR=y
673 -# CONFIG_IPW2100_DEBUG is not set
674 -CONFIG_IPW2200=m
675 -CONFIG_IPW2200_MONITOR=y
676 -CONFIG_IPW2200_RADIOTAP=y
677 -CONFIG_IPW2200_PROMISCUOUS=y
678 -CONFIG_IPW2200_QOS=y
679 -# CONFIG_IPW2200_DEBUG is not set
680 -CONFIG_LIBIPW=m
681 -# CONFIG_LIBIPW_DEBUG is not set
682 CONFIG_IWLWIFI=m
683 +CONFIG_IWLCORE=m
684 CONFIG_IWLWIFI_LEDS=y
685 CONFIG_IWLWIFI_RFKILL=y
686 -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
687 # CONFIG_IWLWIFI_DEBUG is not set
688 CONFIG_IWLAGN=m
689 +# CONFIG_IWLAGN_SPECTRUM_MEASUREMENT is not set
690 +CONFIG_IWLAGN_LEDS=y
691 CONFIG_IWL4965=y
692 CONFIG_IWL5000=y
693 CONFIG_IWL3945=m
694 +CONFIG_IWL3945_RFKILL=y
695 # CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
696 +CONFIG_IWL3945_LEDS=y
697 +CONFIG_IWL3945_DEBUG=y
698 CONFIG_HOSTAP=m
699 CONFIG_HOSTAP_FIRMWARE=y
700 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
701 @@ -1187,20 +1167,8 @@
702 CONFIG_RT2X00_LIB_RFKILL=y
703 CONFIG_RT2X00_LIB_LEDS=y
704 # CONFIG_RT2X00_DEBUG is not set
705 -CONFIG_HERMES=m
706 -CONFIG_HERMES_CACHE_FW_ON_INIT=y
707 -CONFIG_PLX_HERMES=m
708 -CONFIG_TMD_HERMES=m
709 -CONFIG_NORTEL_HERMES=m
710 -CONFIG_PCI_HERMES=m
711 -CONFIG_PCMCIA_HERMES=m
712 -CONFIG_PCMCIA_SPECTRUM=m
713
714 #
715 -# Enable WiMAX (Networking options) to see the WiMAX drivers
716 -#
717 -
718 -#
719 # USB Network Adapters
720 #
721 CONFIG_USB_CATC=m
722 @@ -1210,7 +1178,6 @@
723 CONFIG_USB_USBNET=m
724 CONFIG_USB_NET_AX8817X=m
725 CONFIG_USB_NET_CDCETHER=m
726 -# CONFIG_USB_NET_CDC_EEM is not set
727 CONFIG_USB_NET_DM9601=m
728 CONFIG_USB_NET_SMSC95XX=m
729 CONFIG_USB_NET_GL620A=m
730 @@ -1285,7 +1252,6 @@
731 CONFIG_ATM_FORE200E_DEBUG=0
732 CONFIG_ATM_HE=m
733 CONFIG_ATM_HE_USE_SUNI=y
734 -# CONFIG_ATM_SOLOS is not set
735 CONFIG_FDDI=y
736 CONFIG_DEFXX=m
737 # CONFIG_DEFXX_MMIO is not set
738 @@ -1314,41 +1280,7 @@
739 # CONFIG_NETPOLL is not set
740 # CONFIG_NET_POLL_CONTROLLER is not set
741 CONFIG_VIRTIO_NET=m
742 -CONFIG_ISDN=y
743 -CONFIG_MISDN=m
744 -CONFIG_MISDN_DSP=m
745 -CONFIG_MISDN_L1OIP=m
746 -
747 -#
748 -# mISDN hardware drivers
749 -#
750 -CONFIG_MISDN_HFCPCI=m
751 -CONFIG_MISDN_HFCMULTI=m
752 -CONFIG_MISDN_HFCUSB=m
753 -# CONFIG_ISDN_I4L is not set
754 -CONFIG_ISDN_CAPI=m
755 -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
756 -CONFIG_CAPI_TRACE=y
757 -# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
758 -CONFIG_ISDN_CAPI_CAPI20=m
759 -
760 -#
761 -# CAPI hardware drivers
762 -#
763 -CONFIG_CAPI_AVM=y
764 -CONFIG_ISDN_DRV_AVMB1_B1PCI=m
765 -# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
766 -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
767 -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
768 -CONFIG_ISDN_DRV_AVMB1_T1PCI=m
769 -CONFIG_ISDN_DRV_AVMB1_C4=m
770 -CONFIG_CAPI_EICON=y
771 -CONFIG_ISDN_DIVAS=m
772 -CONFIG_ISDN_DIVAS_BRIPCI=y
773 -CONFIG_ISDN_DIVAS_PRIPCI=y
774 -CONFIG_ISDN_DIVAS_DIVACAPI=m
775 -CONFIG_ISDN_DIVAS_USERIDI=m
776 -CONFIG_ISDN_DIVAS_MAINT=m
777 +# CONFIG_ISDN is not set
778 # CONFIG_PHONE is not set
779
780 #
781 @@ -1393,12 +1325,7 @@
782 CONFIG_MOUSE_BCM5974=m
783 # CONFIG_MOUSE_VSXXXAA is not set
784 # CONFIG_INPUT_JOYSTICK is not set
785 -CONFIG_INPUT_TABLET=y
786 -# CONFIG_TABLET_USB_ACECAD is not set
787 -# CONFIG_TABLET_USB_AIPTEK is not set
788 -# CONFIG_TABLET_USB_GTCO is not set
789 -# CONFIG_TABLET_USB_KBTAB is not set
790 -CONFIG_TABLET_USB_WACOM=m
791 +# CONFIG_INPUT_TABLET is not set
792 # CONFIG_INPUT_TOUCHSCREEN is not set
793 # CONFIG_INPUT_MISC is not set
794
795 @@ -1450,18 +1377,10 @@
796 CONFIG_SERIAL_CORE_CONSOLE=y
797 # CONFIG_SERIAL_JSM is not set
798 CONFIG_UNIX98_PTYS=y
799 -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
800 # CONFIG_LEGACY_PTYS is not set
801 # CONFIG_VIRTIO_CONSOLE is not set
802 -CONFIG_IPMI_HANDLER=m
803 -CONFIG_IPMI_PANIC_EVENT=y
804 -CONFIG_IPMI_PANIC_STRING=y
805 -CONFIG_IPMI_DEVICE_INTERFACE=m
806 -CONFIG_IPMI_SI=m
807 -CONFIG_IPMI_WATCHDOG=m
808 -CONFIG_IPMI_POWEROFF=m
809 +# CONFIG_IPMI_HANDLER is not set
810 CONFIG_HW_RANDOM=y
811 -# CONFIG_HW_RANDOM_TIMERIOMEM is not set
812 CONFIG_HW_RANDOM_INTEL=y
813 CONFIG_HW_RANDOM_AMD=y
814 CONFIG_HW_RANDOM_VIRTIO=m
815 @@ -1543,9 +1462,12 @@
816 # Miscellaneous I2C Chip support
817 #
818 # CONFIG_DS1682 is not set
819 +# CONFIG_AT24 is not set
820 +# CONFIG_SENSORS_EEPROM is not set
821 # CONFIG_SENSORS_PCF8574 is not set
822 # CONFIG_PCF8575 is not set
823 # CONFIG_SENSORS_PCA9539 is not set
824 +# CONFIG_SENSORS_PCF8591 is not set
825 # CONFIG_SENSORS_MAX6875 is not set
826 # CONFIG_SENSORS_TSL2550 is not set
827 # CONFIG_I2C_DEBUG_CORE is not set
828 @@ -1576,10 +1498,8 @@
829 # CONFIG_SENSORS_ADT7462 is not set
830 # CONFIG_SENSORS_ADT7470 is not set
831 # CONFIG_SENSORS_ADT7473 is not set
832 -# CONFIG_SENSORS_ADT7475 is not set
833 # CONFIG_SENSORS_K8TEMP is not set
834 # CONFIG_SENSORS_ASB100 is not set
835 -# CONFIG_SENSORS_ATK0110 is not set
836 # CONFIG_SENSORS_ATXP1 is not set
837 # CONFIG_SENSORS_DS1621 is not set
838 # CONFIG_SENSORS_I5K_AMB is not set
839 @@ -1589,12 +1509,9 @@
840 # CONFIG_SENSORS_FSCHER is not set
841 # CONFIG_SENSORS_FSCPOS is not set
842 # CONFIG_SENSORS_FSCHMD is not set
843 -# CONFIG_SENSORS_G760A is not set
844 # CONFIG_SENSORS_GL518SM is not set
845 # CONFIG_SENSORS_GL520SM is not set
846 # CONFIG_SENSORS_CORETEMP is not set
847 -# CONFIG_SENSORS_IBMAEM is not set
848 -# CONFIG_SENSORS_IBMPEX is not set
849 # CONFIG_SENSORS_IT87 is not set
850 # CONFIG_SENSORS_LM63 is not set
851 # CONFIG_SENSORS_LM75 is not set
852 @@ -1607,14 +1524,10 @@
853 # CONFIG_SENSORS_LM90 is not set
854 # CONFIG_SENSORS_LM92 is not set
855 # CONFIG_SENSORS_LM93 is not set
856 -# CONFIG_SENSORS_LTC4215 is not set
857 -# CONFIG_SENSORS_LTC4245 is not set
858 -# CONFIG_SENSORS_LM95241 is not set
859 # CONFIG_SENSORS_MAX1619 is not set
860 # CONFIG_SENSORS_MAX6650 is not set
861 # CONFIG_SENSORS_PC87360 is not set
862 # CONFIG_SENSORS_PC87427 is not set
863 -# CONFIG_SENSORS_PCF8591 is not set
864 # CONFIG_SENSORS_SIS5595 is not set
865 # CONFIG_SENSORS_DME1737 is not set
866 # CONFIG_SENSORS_SMSC47M1 is not set
867 @@ -1667,7 +1580,6 @@
868 # CONFIG_MFD_TMIO is not set
869 # CONFIG_MFD_WM8400 is not set
870 # CONFIG_MFD_WM8350_I2C is not set
871 -# CONFIG_MFD_PCF50633 is not set
872 # CONFIG_REGULATOR is not set
873
874 #
875 @@ -1677,128 +1589,13 @@
876 #
877 # Multimedia core support
878 #
879 -CONFIG_VIDEO_DEV=m
880 -CONFIG_VIDEO_V4L2_COMMON=m
881 -CONFIG_VIDEO_ALLOW_V4L1=y
882 -CONFIG_VIDEO_V4L1_COMPAT=y
883 +# CONFIG_VIDEO_DEV is not set
884 # CONFIG_DVB_CORE is not set
885 -CONFIG_VIDEO_MEDIA=m
886 +# CONFIG_VIDEO_MEDIA is not set
887
888 #
889 # Multimedia drivers
890 #
891 -# CONFIG_MEDIA_ATTACH is not set
892 -CONFIG_MEDIA_TUNER=m
893 -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
894 -CONFIG_MEDIA_TUNER_SIMPLE=m
895 -CONFIG_MEDIA_TUNER_TDA8290=m
896 -CONFIG_MEDIA_TUNER_TDA9887=m
897 -CONFIG_MEDIA_TUNER_TEA5761=m
898 -CONFIG_MEDIA_TUNER_TEA5767=m
899 -CONFIG_MEDIA_TUNER_MT20XX=m
900 -CONFIG_MEDIA_TUNER_XC2028=m
901 -CONFIG_MEDIA_TUNER_XC5000=m
902 -CONFIG_MEDIA_TUNER_MC44S803=m
903 -CONFIG_VIDEO_V4L2=m
904 -CONFIG_VIDEO_V4L1=m
905 -CONFIG_VIDEOBUF_GEN=m
906 -CONFIG_VIDEOBUF_VMALLOC=m
907 -CONFIG_VIDEO_IR=m
908 -CONFIG_VIDEO_TVEEPROM=m
909 -CONFIG_VIDEO_TUNER=m
910 -CONFIG_VIDEO_CAPTURE_DRIVERS=y
911 -# CONFIG_VIDEO_ADV_DEBUG is not set
912 -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
913 -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
914 -CONFIG_VIDEO_IR_I2C=m
915 -CONFIG_VIDEO_MSP3400=m
916 -CONFIG_VIDEO_CS53L32A=m
917 -CONFIG_VIDEO_WM8775=m
918 -CONFIG_VIDEO_SAA711X=m
919 -CONFIG_VIDEO_CX25840=m
920 -CONFIG_VIDEO_CX2341X=m
921 -# CONFIG_VIDEO_VIVI is not set
922 -# CONFIG_VIDEO_BT848 is not set
923 -# CONFIG_VIDEO_CPIA is not set
924 -# CONFIG_VIDEO_CPIA2 is not set
925 -# CONFIG_VIDEO_SAA5246A is not set
926 -# CONFIG_VIDEO_SAA5249 is not set
927 -# CONFIG_VIDEO_STRADIS is not set
928 -# CONFIG_VIDEO_ZORAN is not set
929 -# CONFIG_VIDEO_MEYE is not set
930 -# CONFIG_VIDEO_SAA7134 is not set
931 -# CONFIG_VIDEO_MXB is not set
932 -# CONFIG_VIDEO_HEXIUM_ORION is not set
933 -# CONFIG_VIDEO_HEXIUM_GEMINI is not set
934 -# CONFIG_VIDEO_CX88 is not set
935 -# CONFIG_VIDEO_IVTV is not set
936 -# CONFIG_VIDEO_CAFE_CCIC is not set
937 -# CONFIG_SOC_CAMERA is not set
938 -CONFIG_V4L_USB_DRIVERS=y
939 -CONFIG_USB_VIDEO_CLASS=m
940 -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
941 -CONFIG_USB_GSPCA=m
942 -# CONFIG_USB_M5602 is not set
943 -# CONFIG_USB_STV06XX is not set
944 -# CONFIG_USB_GSPCA_CONEX is not set
945 -# CONFIG_USB_GSPCA_ETOMS is not set
946 -# CONFIG_USB_GSPCA_FINEPIX is not set
947 -# CONFIG_USB_GSPCA_MARS is not set
948 -# CONFIG_USB_GSPCA_MR97310A is not set
949 -# CONFIG_USB_GSPCA_OV519 is not set
950 -# CONFIG_USB_GSPCA_OV534 is not set
951 -# CONFIG_USB_GSPCA_PAC207 is not set
952 -# CONFIG_USB_GSPCA_PAC7311 is not set
953 -# CONFIG_USB_GSPCA_SONIXB is not set
954 -# CONFIG_USB_GSPCA_SONIXJ is not set
955 -# CONFIG_USB_GSPCA_SPCA500 is not set
956 -# CONFIG_USB_GSPCA_SPCA501 is not set
957 -# CONFIG_USB_GSPCA_SPCA505 is not set
958 -# CONFIG_USB_GSPCA_SPCA506 is not set
959 -# CONFIG_USB_GSPCA_SPCA508 is not set
960 -# CONFIG_USB_GSPCA_SPCA561 is not set
961 -# CONFIG_USB_GSPCA_SQ905 is not set
962 -# CONFIG_USB_GSPCA_SQ905C is not set
963 -# CONFIG_USB_GSPCA_STK014 is not set
964 -# CONFIG_USB_GSPCA_SUNPLUS is not set
965 -# CONFIG_USB_GSPCA_T613 is not set
966 -# CONFIG_USB_GSPCA_TV8532 is not set
967 -# CONFIG_USB_GSPCA_VC032X is not set
968 -# CONFIG_USB_GSPCA_ZC3XX is not set
969 -CONFIG_VIDEO_PVRUSB2=m
970 -CONFIG_VIDEO_PVRUSB2_SYSFS=y
971 -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
972 -CONFIG_VIDEO_HDPVR=m
973 -# CONFIG_VIDEO_EM28XX is not set
974 -CONFIG_VIDEO_CX231XX=m
975 -# CONFIG_VIDEO_CX231XX_ALSA is not set
976 -# CONFIG_VIDEO_USBVISION is not set
977 -CONFIG_VIDEO_USBVIDEO=m
978 -# CONFIG_USB_VICAM is not set
979 -# CONFIG_USB_IBMCAM is not set
980 -# CONFIG_USB_KONICAWC is not set
981 -CONFIG_USB_QUICKCAM_MESSENGER=m
982 -# CONFIG_USB_ET61X251 is not set
983 -# CONFIG_VIDEO_OVCAMCHIP is not set
984 -# CONFIG_USB_OV511 is not set
985 -# CONFIG_USB_SE401 is not set
986 -# CONFIG_USB_SN9C102 is not set
987 -# CONFIG_USB_STV680 is not set
988 -# CONFIG_USB_ZC0301 is not set
989 -CONFIG_USB_PWC=m
990 -# CONFIG_USB_PWC_DEBUG is not set
991 -CONFIG_USB_PWC_INPUT_EVDEV=y
992 -# CONFIG_USB_ZR364XX is not set
993 -# CONFIG_USB_STKWEBCAM is not set
994 -# CONFIG_USB_S2255 is not set
995 -CONFIG_RADIO_ADAPTERS=y
996 -# CONFIG_RADIO_GEMTEK_PCI is not set
997 -# CONFIG_RADIO_MAXIRADIO is not set
998 -# CONFIG_RADIO_MAESTRO is not set
999 -# CONFIG_USB_DSBR is not set
1000 -# CONFIG_USB_SI470X is not set
1001 -# CONFIG_USB_MR800 is not set
1002 -# CONFIG_RADIO_TEA5764 is not set
1003 # CONFIG_DAB is not set
1004
1005 #
1006 @@ -1806,21 +1603,10 @@
1007 #
1008 CONFIG_AGP=y
1009 CONFIG_AGP_AMD64=y
1010 -CONFIG_AGP_INTEL=m
1011 -CONFIG_AGP_SIS=m
1012 -CONFIG_AGP_VIA=m
1013 -CONFIG_DRM=m
1014 -CONFIG_DRM_TDFX=m
1015 -CONFIG_DRM_R128=m
1016 -CONFIG_DRM_RADEON=m
1017 -CONFIG_DRM_I810=m
1018 -CONFIG_DRM_I830=m
1019 -CONFIG_DRM_I915=m
1020 -# CONFIG_DRM_I915_KMS is not set
1021 -CONFIG_DRM_MGA=m
1022 -CONFIG_DRM_SIS=m
1023 -CONFIG_DRM_VIA=m
1024 -CONFIG_DRM_SAVAGE=m
1025 +# CONFIG_AGP_INTEL is not set
1026 +# CONFIG_AGP_SIS is not set
1027 +# CONFIG_AGP_VIA is not set
1028 +# CONFIG_DRM is not set
1029 # CONFIG_VGASTATE is not set
1030 CONFIG_VIDEO_OUTPUT_CONTROL=m
1031 CONFIG_FB=y
1032 @@ -1882,13 +1668,12 @@
1033 # CONFIG_FB_VIRTUAL is not set
1034 # CONFIG_FB_METRONOME is not set
1035 # CONFIG_FB_MB862XX is not set
1036 -# CONFIG_FB_BROADSHEET is not set
1037 CONFIG_BACKLIGHT_LCD_SUPPORT=y
1038 CONFIG_LCD_CLASS_DEVICE=m
1039 # CONFIG_LCD_ILI9320 is not set
1040 # CONFIG_LCD_PLATFORM is not set
1041 CONFIG_BACKLIGHT_CLASS_DEVICE=m
1042 -CONFIG_BACKLIGHT_GENERIC=m
1043 +# CONFIG_BACKLIGHT_CORGI is not set
1044 # CONFIG_BACKLIGHT_PROGEAR is not set
1045 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
1046 # CONFIG_BACKLIGHT_SAHARA is not set
1047 @@ -1922,7 +1707,6 @@
1048 CONFIG_SND_PCM=m
1049 CONFIG_SND_HWDEP=m
1050 CONFIG_SND_RAWMIDI=m
1051 -CONFIG_SND_JACK=y
1052 CONFIG_SND_SEQUENCER=m
1053 # CONFIG_SND_SEQ_DUMMY is not set
1054 CONFIG_SND_OSSEMUL=y
1055 @@ -1940,6 +1724,7 @@
1056 CONFIG_SND_VMASTER=y
1057 CONFIG_SND_MPU401_UART=m
1058 CONFIG_SND_OPL3_LIB=m
1059 +CONFIG_SND_OPL4_LIB=m
1060 CONFIG_SND_VX_LIB=m
1061 CONFIG_SND_AC97_CODEC=m
1062 CONFIG_SND_DRIVERS=y
1063 @@ -1949,8 +1734,43 @@
1064 CONFIG_SND_SERIAL_U16550=m
1065 CONFIG_SND_MPU401=m
1066 # CONFIG_SND_AC97_POWER_SAVE is not set
1067 +CONFIG_SND_WSS_LIB=m
1068 CONFIG_SND_SB_COMMON=m
1069 +CONFIG_SND_SB8_DSP=m
1070 CONFIG_SND_SB16_DSP=m
1071 +CONFIG_SND_ISA=y
1072 +CONFIG_SND_ADLIB=m
1073 +CONFIG_SND_AD1816A=m
1074 +CONFIG_SND_AD1848=m
1075 +CONFIG_SND_ALS100=m
1076 +CONFIG_SND_AZT2320=m
1077 +CONFIG_SND_CMI8330=m
1078 +CONFIG_SND_CS4231=m
1079 +CONFIG_SND_CS4232=m
1080 +CONFIG_SND_CS4236=m
1081 +CONFIG_SND_DT019X=m
1082 +CONFIG_SND_ES968=m
1083 +CONFIG_SND_ES1688=m
1084 +CONFIG_SND_ES18XX=m
1085 +CONFIG_SND_SC6000=m
1086 +CONFIG_SND_GUSCLASSIC=m
1087 +CONFIG_SND_GUSEXTREME=m
1088 +CONFIG_SND_GUSMAX=m
1089 +CONFIG_SND_INTERWAVE=m
1090 +CONFIG_SND_INTERWAVE_STB=m
1091 +CONFIG_SND_OPL3SA2=m
1092 +CONFIG_SND_OPTI92X_AD1848=m
1093 +CONFIG_SND_OPTI92X_CS4231=m
1094 +CONFIG_SND_OPTI93X=m
1095 +CONFIG_SND_MIRO=m
1096 +CONFIG_SND_SB8=m
1097 +CONFIG_SND_SB16=m
1098 +CONFIG_SND_SBAWE=m
1099 +CONFIG_SND_SB16_CSP=y
1100 +CONFIG_SND_SGALAXY=m
1101 +CONFIG_SND_SSCAPE=m
1102 +CONFIG_SND_WAVEFRONT=m
1103 +CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y
1104 CONFIG_SND_PCI=y
1105 CONFIG_SND_AD1889=m
1106 CONFIG_SND_ALS300=m
1107 @@ -1973,6 +1793,7 @@
1108 CONFIG_SND_CS46XX=m
1109 CONFIG_SND_CS46XX_NEW_DSP=y
1110 CONFIG_SND_CS5530=m
1111 +CONFIG_SND_CS5535AUDIO=m
1112 CONFIG_SND_DARLA20=m
1113 CONFIG_SND_GINA20=m
1114 CONFIG_SND_LAYLA20=m
1115 @@ -1985,8 +1806,6 @@
1116 CONFIG_SND_INDIGO=m
1117 CONFIG_SND_INDIGOIO=m
1118 CONFIG_SND_INDIGODJ=m
1119 -CONFIG_SND_INDIGOIOX=m
1120 -CONFIG_SND_INDIGODJX=m
1121 CONFIG_SND_EMU10K1=m
1122 CONFIG_SND_EMU10K1X=m
1123 CONFIG_SND_ENS1370=m
1124 @@ -1994,7 +1813,6 @@
1125 CONFIG_SND_ES1938=m
1126 CONFIG_SND_ES1968=m
1127 CONFIG_SND_FM801=m
1128 -# CONFIG_SND_FM801_TEA575X_BOOL is not set
1129 CONFIG_SND_HDA_INTEL=m
1130 # CONFIG_SND_HDA_HWDEP is not set
1131 # CONFIG_SND_HDA_INPUT_BEEP is not set
1132 @@ -2004,8 +1822,6 @@
1133 CONFIG_SND_HDA_CODEC_VIA=y
1134 CONFIG_SND_HDA_CODEC_ATIHDMI=y
1135 CONFIG_SND_HDA_CODEC_NVHDMI=y
1136 -CONFIG_SND_HDA_CODEC_INTELHDMI=y
1137 -CONFIG_SND_HDA_ELD=y
1138 CONFIG_SND_HDA_CODEC_CONEXANT=y
1139 CONFIG_SND_HDA_CODEC_CMEDIA=y
1140 CONFIG_SND_HDA_CODEC_SI3054=y
1141 @@ -2028,6 +1844,7 @@
1142 CONFIG_SND_RME32=m
1143 CONFIG_SND_RME96=m
1144 CONFIG_SND_RME9652=m
1145 +CONFIG_SND_SIS7019=m
1146 CONFIG_SND_SONICVIBES=m
1147 CONFIG_SND_TRIDENT=m
1148 CONFIG_SND_VIA82XX=m
1149 @@ -2045,7 +1862,6 @@
1150 CONFIG_SND_VXPOCKET=m
1151 CONFIG_SND_PDAUDIOCF=m
1152 CONFIG_SND_SOC=m
1153 -CONFIG_SND_SOC_I2C_AND_SPI=m
1154 # CONFIG_SND_SOC_ALL_CODECS is not set
1155 # CONFIG_SOUND_PRIME is not set
1156 CONFIG_AC97_BUS=m
1157 @@ -2070,31 +1886,28 @@
1158 #
1159 # Special HID drivers
1160 #
1161 +CONFIG_HID_COMPAT=y
1162 CONFIG_HID_A4TECH=m
1163 CONFIG_HID_APPLE=m
1164 CONFIG_HID_BELKIN=m
1165 +CONFIG_HID_BRIGHT=m
1166 CONFIG_HID_CHERRY=m
1167 CONFIG_HID_CHICONY=m
1168 CONFIG_HID_CYPRESS=m
1169 -# CONFIG_DRAGONRISE_FF is not set
1170 +CONFIG_HID_DELL=m
1171 CONFIG_HID_EZKEY=m
1172 -# CONFIG_HID_KYE is not set
1173 CONFIG_HID_GYRATION=m
1174 -# CONFIG_HID_KENSINGTON is not set
1175 CONFIG_HID_LOGITECH=m
1176 # CONFIG_LOGITECH_FF is not set
1177 # CONFIG_LOGIRUMBLEPAD2_FF is not set
1178 CONFIG_HID_MICROSOFT=m
1179 CONFIG_HID_MONTEREY=m
1180 -# CONFIG_HID_NTRIG is not set
1181 CONFIG_HID_PANTHERLORD=m
1182 # CONFIG_PANTHERLORD_FF is not set
1183 CONFIG_HID_PETALYNX=m
1184 CONFIG_HID_SAMSUNG=m
1185 CONFIG_HID_SONY=m
1186 CONFIG_HID_SUNPLUS=m
1187 -# CONFIG_GREENASIA_FF is not set
1188 -# CONFIG_HID_TOPSEED is not set
1189 # CONFIG_THRUSTMASTER_FF is not set
1190 # CONFIG_ZEROPLUS_FF is not set
1191 CONFIG_USB_SUPPORT=y
1192 @@ -2115,7 +1928,7 @@
1193 # CONFIG_USB_OTG is not set
1194 # CONFIG_USB_OTG_WHITELIST is not set
1195 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
1196 -CONFIG_USB_MON=m
1197 +# CONFIG_USB_MON is not set
1198 # CONFIG_USB_WUSB is not set
1199 # CONFIG_USB_WUSB_CBAF is not set
1200
1201 @@ -2126,7 +1939,6 @@
1202 CONFIG_USB_EHCI_HCD=m
1203 CONFIG_USB_EHCI_ROOT_HUB_TT=y
1204 CONFIG_USB_EHCI_TT_NEWSCHED=y
1205 -# CONFIG_USB_OXU210HP_HCD is not set
1206 CONFIG_USB_ISP116X_HCD=m
1207 # CONFIG_USB_ISP1760_HCD is not set
1208 CONFIG_USB_OHCI_HCD=m
1209 @@ -2150,29 +1962,30 @@
1210 # USB Device Class drivers
1211 #
1212 CONFIG_USB_ACM=m
1213 -CONFIG_USB_PRINTER=m
1214 +# CONFIG_USB_PRINTER is not set
1215 # CONFIG_USB_WDM is not set
1216 # CONFIG_USB_TMC is not set
1217
1218 #
1219 -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1220 +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1221 #
1222
1223 #
1224 -# also be needed; see USB_STORAGE Help for more info
1225 +# see USB_STORAGE Help for more information
1226 #
1227 CONFIG_USB_STORAGE=m
1228 CONFIG_USB_STORAGE_DEBUG=y
1229 -CONFIG_USB_STORAGE_DATAFAB=m
1230 -CONFIG_USB_STORAGE_FREECOM=m
1231 -CONFIG_USB_STORAGE_ISD200=m
1232 -CONFIG_USB_STORAGE_USBAT=m
1233 -CONFIG_USB_STORAGE_SDDR09=m
1234 -CONFIG_USB_STORAGE_SDDR55=m
1235 -CONFIG_USB_STORAGE_JUMPSHOT=m
1236 -CONFIG_USB_STORAGE_ALAUDA=m
1237 +CONFIG_USB_STORAGE_DATAFAB=y
1238 +CONFIG_USB_STORAGE_FREECOM=y
1239 +CONFIG_USB_STORAGE_ISD200=y
1240 +CONFIG_USB_STORAGE_DPCM=y
1241 +CONFIG_USB_STORAGE_USBAT=y
1242 +CONFIG_USB_STORAGE_SDDR09=y
1243 +CONFIG_USB_STORAGE_SDDR55=y
1244 +CONFIG_USB_STORAGE_JUMPSHOT=y
1245 +CONFIG_USB_STORAGE_ALAUDA=y
1246 # CONFIG_USB_STORAGE_ONETOUCH is not set
1247 -CONFIG_USB_STORAGE_KARMA=m
1248 +CONFIG_USB_STORAGE_KARMA=y
1249 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1250 # CONFIG_USB_LIBUSUAL is not set
1251
1252 @@ -2201,6 +2014,7 @@
1253 # CONFIG_USB_LED is not set
1254 # CONFIG_USB_CYPRESS_CY7C63 is not set
1255 # CONFIG_USB_CYTHERM is not set
1256 +# CONFIG_USB_PHIDGET is not set
1257 # CONFIG_USB_IDMOUSE is not set
1258 CONFIG_USB_FTDI_ELAN=m
1259 # CONFIG_USB_APPLEDISPLAY is not set
1260 @@ -2218,11 +2032,6 @@
1261 CONFIG_USB_UEAGLEATM=m
1262 CONFIG_USB_XUSBATM=m
1263 # CONFIG_USB_GADGET is not set
1264 -
1265 -#
1266 -# OTG and related infrastructure
1267 -#
1268 -# CONFIG_NOP_USB_XCEIV is not set
1269 # CONFIG_UWB is not set
1270 # CONFIG_MMC is not set
1271 # CONFIG_MEMSTICK is not set
1272 @@ -2232,12 +2041,10 @@
1273 #
1274 # LED drivers
1275 #
1276 -# CONFIG_LEDS_ALIX2 is not set
1277 # CONFIG_LEDS_PCA9532 is not set
1278 -# CONFIG_LEDS_LP5521 is not set
1279 +# CONFIG_LEDS_HP_DISK is not set
1280 # CONFIG_LEDS_CLEVO_MAIL is not set
1281 # CONFIG_LEDS_PCA955X is not set
1282 -# CONFIG_LEDS_BD2802 is not set
1283
1284 #
1285 # LED Triggers
1286 @@ -2248,10 +2055,6 @@
1287 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
1288 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
1289 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
1290 -
1291 -#
1292 -# iptables trigger is under Netfilter config (LED target)
1293 -#
1294 # CONFIG_ACCESSIBILITY is not set
1295 CONFIG_INFINIBAND=m
1296 # CONFIG_INFINIBAND_USER_MAD is not set
1297 @@ -2285,39 +2088,15 @@
1298 # DMA Clients
1299 #
1300 CONFIG_NET_DMA=y
1301 -# CONFIG_ASYNC_TX_DMA is not set
1302 # CONFIG_DMATEST is not set
1303 CONFIG_DCA=y
1304 -# CONFIG_AUXDISPLAY is not set
1305 CONFIG_UIO=m
1306 # CONFIG_UIO_CIF is not set
1307 # CONFIG_UIO_PDRV is not set
1308 # CONFIG_UIO_PDRV_GENIRQ is not set
1309 # CONFIG_UIO_SMX is not set
1310 -# CONFIG_UIO_AEC is not set
1311 # CONFIG_UIO_SERCOS3 is not set
1312 # CONFIG_STAGING is not set
1313 -CONFIG_X86_PLATFORM_DEVICES=y
1314 -# CONFIG_ACER_WMI is not set
1315 -# CONFIG_ASUS_LAPTOP is not set
1316 -CONFIG_FUJITSU_LAPTOP=m
1317 -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
1318 -CONFIG_MSI_LAPTOP=m
1319 -# CONFIG_PANASONIC_LAPTOP is not set
1320 -# CONFIG_COMPAL_LAPTOP is not set
1321 -CONFIG_SONY_LAPTOP=m
1322 -CONFIG_SONYPI_COMPAT=y
1323 -CONFIG_THINKPAD_ACPI=m
1324 -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
1325 -# CONFIG_THINKPAD_ACPI_DEBUG is not set
1326 -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
1327 -CONFIG_THINKPAD_ACPI_VIDEO=y
1328 -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
1329 -# CONFIG_INTEL_MENLOW is not set
1330 -CONFIG_EEEPC_LAPTOP=m
1331 -# CONFIG_ACPI_WMI is not set
1332 -CONFIG_ACPI_ASUS=m
1333 -CONFIG_ACPI_TOSHIBA=m
1334
1335 #
1336 # Firmware Drivers
1337 @@ -2339,12 +2118,11 @@
1338 CONFIG_EXT2_FS_SECURITY=y
1339 # CONFIG_EXT2_FS_XIP is not set
1340 CONFIG_EXT3_FS=y
1341 -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1342 CONFIG_EXT3_FS_XATTR=y
1343 CONFIG_EXT3_FS_POSIX_ACL=y
1344 CONFIG_EXT3_FS_SECURITY=y
1345 CONFIG_EXT4_FS=y
1346 -# CONFIG_EXT4DEV_COMPAT is not set
1347 +CONFIG_EXT4DEV_COMPAT=y
1348 CONFIG_EXT4_FS_XATTR=y
1349 CONFIG_EXT4_FS_POSIX_ACL=y
1350 CONFIG_EXT4_FS_SECURITY=y
1351 @@ -2363,31 +2141,25 @@
1352 # CONFIG_JFS_DEBUG is not set
1353 # CONFIG_JFS_STATISTICS is not set
1354 CONFIG_FS_POSIX_ACL=y
1355 -CONFIG_XFS_FS=m
1356 +CONFIG_FILE_LOCKING=y
1357 +CONFIG_XFS_FS=y
1358 CONFIG_XFS_QUOTA=y
1359 CONFIG_XFS_POSIX_ACL=y
1360 CONFIG_XFS_RT=y
1361 # CONFIG_XFS_DEBUG is not set
1362 CONFIG_GFS2_FS=m
1363 -# CONFIG_GFS2_FS_LOCKING_DLM is not set
1364 +CONFIG_GFS2_FS_LOCKING_DLM=m
1365 CONFIG_OCFS2_FS=m
1366 CONFIG_OCFS2_FS_O2CB=m
1367 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
1368 CONFIG_OCFS2_FS_STATS=y
1369 CONFIG_OCFS2_DEBUG_MASKLOG=y
1370 # CONFIG_OCFS2_DEBUG_FS is not set
1371 -# CONFIG_OCFS2_FS_POSIX_ACL is not set
1372 -# CONFIG_BTRFS_FS is not set
1373 -CONFIG_FILE_LOCKING=y
1374 +# CONFIG_OCFS2_COMPAT_JBD is not set
1375 CONFIG_DNOTIFY=y
1376 CONFIG_INOTIFY=y
1377 CONFIG_INOTIFY_USER=y
1378 -CONFIG_QUOTA=y
1379 -# CONFIG_QUOTA_NETLINK_INTERFACE is not set
1380 -CONFIG_PRINT_QUOTA_WARNING=y
1381 -CONFIG_QUOTA_TREE=m
1382 -# CONFIG_QFMT_V1 is not set
1383 -# CONFIG_QFMT_V2 is not set
1384 +# CONFIG_QUOTA is not set
1385 CONFIG_QUOTACTL=y
1386 # CONFIG_AUTOFS_FS is not set
1387 # CONFIG_AUTOFS4_FS is not set
1388 @@ -2395,11 +2167,6 @@
1389 CONFIG_GENERIC_ACL=y
1390
1391 #
1392 -# Caches
1393 -#
1394 -# CONFIG_FSCACHE is not set
1395 -
1396 -#
1397 # CD-ROM/DVD Filesystems
1398 #
1399 CONFIG_ISO9660_FS=y
1400 @@ -2433,7 +2200,10 @@
1401 # CONFIG_HUGETLBFS is not set
1402 # CONFIG_HUGETLB_PAGE is not set
1403 CONFIG_CONFIGFS_FS=m
1404 -CONFIG_MISC_FILESYSTEMS=y
1405 +
1406 +#
1407 +# Miscellaneous filesystems
1408 +#
1409 # CONFIG_ADFS_FS is not set
1410 # CONFIG_AFFS_FS is not set
1411 CONFIG_HFS_FS=y
1412 @@ -2453,7 +2223,6 @@
1413 # CONFIG_ROMFS_FS is not set
1414 # CONFIG_SYSV_FS is not set
1415 # CONFIG_UFS_FS is not set
1416 -CONFIG_NILFS2_FS=m
1417 CONFIG_NETWORK_FILESYSTEMS=y
1418 CONFIG_NFS_FS=y
1419 CONFIG_NFS_V3=y
1420 @@ -2463,12 +2232,12 @@
1421 # CONFIG_NFSD is not set
1422 CONFIG_LOCKD=y
1423 CONFIG_LOCKD_V4=y
1424 -CONFIG_EXPORTFS=m
1425 CONFIG_NFS_ACL_SUPPORT=y
1426 CONFIG_NFS_COMMON=y
1427 CONFIG_SUNRPC=y
1428 CONFIG_SUNRPC_GSS=y
1429 CONFIG_SUNRPC_XPRT_RDMA=m
1430 +# CONFIG_SUNRPC_REGISTER_V4 is not set
1431 CONFIG_RPCSEC_GSS_KRB5=y
1432 CONFIG_RPCSEC_GSS_SPKM3=m
1433 # CONFIG_SMB_FS is not set
1434 @@ -2553,7 +2322,7 @@
1435 #
1436 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1437 # CONFIG_PRINTK_TIME is not set
1438 -# CONFIG_ENABLE_WARN_DEPRECATED is not set
1439 +CONFIG_ENABLE_WARN_DEPRECATED=y
1440 CONFIG_ENABLE_MUST_CHECK=y
1441 CONFIG_FRAME_WARN=1024
1442 CONFIG_MAGIC_SYSRQ=y
1443 @@ -2565,9 +2334,6 @@
1444 CONFIG_DETECT_SOFTLOCKUP=y
1445 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1446 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1447 -CONFIG_DETECT_HUNG_TASK=y
1448 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1449 -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1450 CONFIG_SCHED_DEBUG=y
1451 # CONFIG_SCHEDSTATS is not set
1452 # CONFIG_TIMER_STATS is not set
1453 @@ -2591,8 +2357,6 @@
1454 # CONFIG_DEBUG_MEMORY_INIT is not set
1455 # CONFIG_DEBUG_LIST is not set
1456 # CONFIG_DEBUG_SG is not set
1457 -# CONFIG_DEBUG_NOTIFIERS is not set
1458 -CONFIG_ARCH_WANT_FRAME_POINTERS=y
1459 # CONFIG_FRAME_POINTER is not set
1460 # CONFIG_BOOT_PRINTK_DELAY is not set
1461 # CONFIG_RCU_TORTURE_TEST is not set
1462 @@ -2602,15 +2366,9 @@
1463 # CONFIG_FAULT_INJECTION is not set
1464 # CONFIG_LATENCYTOP is not set
1465 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
1466 -# CONFIG_DEBUG_PAGEALLOC is not set
1467 -CONFIG_USER_STACKTRACE_SUPPORT=y
1468 CONFIG_HAVE_FUNCTION_TRACER=y
1469 -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1470 -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1471 CONFIG_HAVE_DYNAMIC_FTRACE=y
1472 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1473 -CONFIG_HAVE_FTRACE_SYSCALLS=y
1474 -CONFIG_TRACING_SUPPORT=y
1475
1476 #
1477 # Tracers
1478 @@ -2620,18 +2378,10 @@
1479 # CONFIG_SYSPROF_TRACER is not set
1480 # CONFIG_SCHED_TRACER is not set
1481 # CONFIG_CONTEXT_SWITCH_TRACER is not set
1482 -# CONFIG_EVENT_TRACER is not set
1483 -# CONFIG_FTRACE_SYSCALLS is not set
1484 # CONFIG_BOOT_TRACER is not set
1485 -# CONFIG_TRACE_BRANCH_PROFILING is not set
1486 -# CONFIG_POWER_TRACER is not set
1487 # CONFIG_STACK_TRACER is not set
1488 -# CONFIG_KMEMTRACE is not set
1489 -# CONFIG_WORKQUEUE_TRACER is not set
1490 -# CONFIG_BLK_DEV_IO_TRACE is not set
1491 -# CONFIG_MMIOTRACE is not set
1492 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
1493 -# CONFIG_DMA_API_DEBUG is not set
1494 +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1495 # CONFIG_SAMPLES is not set
1496 CONFIG_HAVE_ARCH_KGDB=y
1497 # CONFIG_KGDB is not set
1498 @@ -2641,13 +2391,15 @@
1499 # CONFIG_EARLY_PRINTK_DBGP is not set
1500 # CONFIG_DEBUG_STACKOVERFLOW is not set
1501 # CONFIG_DEBUG_STACK_USAGE is not set
1502 +# CONFIG_DEBUG_PAGEALLOC is not set
1503 # CONFIG_DEBUG_PER_CPU_MAPS is not set
1504 # CONFIG_X86_PTDUMP is not set
1505 CONFIG_DEBUG_RODATA=y
1506 +# CONFIG_DIRECT_GBPAGES is not set
1507 # CONFIG_DEBUG_RODATA_TEST is not set
1508 # CONFIG_DEBUG_NX_TEST is not set
1509 # CONFIG_IOMMU_DEBUG is not set
1510 -CONFIG_HAVE_MMIOTRACE_SUPPORT=y
1511 +# CONFIG_MMIOTRACE is not set
1512 CONFIG_IO_DELAY_TYPE_0X80=0
1513 CONFIG_IO_DELAY_TYPE_0XED=1
1514 CONFIG_IO_DELAY_TYPE_UDELAY=2
1515 @@ -2667,7 +2419,6 @@
1516 # CONFIG_SECURITY is not set
1517 # CONFIG_SECURITYFS is not set
1518 CONFIG_SECURITY_FILE_CAPABILITIES=y
1519 -# CONFIG_IMA is not set
1520 CONFIG_XOR_BLOCKS=m
1521 CONFIG_ASYNC_CORE=m
1522 CONFIG_ASYNC_MEMCPY=m
1523 @@ -2687,12 +2438,10 @@
1524 CONFIG_CRYPTO_HASH=y
1525 CONFIG_CRYPTO_HASH2=y
1526 CONFIG_CRYPTO_RNG2=y
1527 -CONFIG_CRYPTO_PCOMP=y
1528 CONFIG_CRYPTO_MANAGER=y
1529 CONFIG_CRYPTO_MANAGER2=y
1530 CONFIG_CRYPTO_GF128MUL=m
1531 CONFIG_CRYPTO_NULL=m
1532 -CONFIG_CRYPTO_WORKQUEUE=y
1533 CONFIG_CRYPTO_CRYPTD=m
1534 CONFIG_CRYPTO_AUTHENC=m
1535 CONFIG_CRYPTO_TEST=m
1536 @@ -2731,8 +2480,8 @@
1537 CONFIG_CRYPTO_MICHAEL_MIC=m
1538 # CONFIG_CRYPTO_RMD128 is not set
1539 # CONFIG_CRYPTO_RMD160 is not set
1540 -CONFIG_CRYPTO_RMD256=m
1541 -CONFIG_CRYPTO_RMD320=m
1542 +# CONFIG_CRYPTO_RMD256 is not set
1543 +# CONFIG_CRYPTO_RMD320 is not set
1544 CONFIG_CRYPTO_SHA1=m
1545 CONFIG_CRYPTO_SHA256=m
1546 CONFIG_CRYPTO_SHA512=m
1547 @@ -2744,7 +2493,6 @@
1548 #
1549 CONFIG_CRYPTO_AES=m
1550 CONFIG_CRYPTO_AES_X86_64=m
1551 -CONFIG_CRYPTO_AES_NI_INTEL=m
1552 CONFIG_CRYPTO_ANUBIS=m
1553 CONFIG_CRYPTO_ARC4=m
1554 CONFIG_CRYPTO_BLOWFISH=m
1555 @@ -2754,7 +2502,7 @@
1556 CONFIG_CRYPTO_DES=y
1557 CONFIG_CRYPTO_FCRYPT=m
1558 CONFIG_CRYPTO_KHAZAD=m
1559 -CONFIG_CRYPTO_SALSA20=m
1560 +# CONFIG_CRYPTO_SALSA20 is not set
1561 CONFIG_CRYPTO_SALSA20_X86_64=m
1562 CONFIG_CRYPTO_SEED=m
1563 CONFIG_CRYPTO_SERPENT=m
1564 @@ -2767,8 +2515,7 @@
1565 # Compression
1566 #
1567 CONFIG_CRYPTO_DEFLATE=m
1568 -CONFIG_CRYPTO_ZLIB=m
1569 -CONFIG_CRYPTO_LZO=m
1570 +# CONFIG_CRYPTO_LZO is not set
1571
1572 #
1573 # Random Number Generation
1574 @@ -2777,14 +2524,12 @@
1575 CONFIG_CRYPTO_HW=y
1576 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
1577 CONFIG_HAVE_KVM=y
1578 -CONFIG_HAVE_KVM_IRQCHIP=y
1579 CONFIG_VIRTUALIZATION=y
1580 # CONFIG_KVM is not set
1581 CONFIG_VIRTIO=m
1582 CONFIG_VIRTIO_RING=m
1583 CONFIG_VIRTIO_PCI=m
1584 CONFIG_VIRTIO_BALLOON=m
1585 -# CONFIG_BINARY_PRINTF is not set
1586
1587 #
1588 # Library routines
1589 @@ -2792,7 +2537,6 @@
1590 CONFIG_BITREVERSE=y
1591 CONFIG_GENERIC_FIND_FIRST_BIT=y
1592 CONFIG_GENERIC_FIND_NEXT_BIT=y
1593 -CONFIG_GENERIC_FIND_LAST_BIT=y
1594 CONFIG_CRC_CCITT=m
1595 CONFIG_CRC16=y
1596 # CONFIG_CRC_T10DIF is not set
1597 @@ -2802,12 +2546,9 @@
1598 CONFIG_LIBCRC32C=y
1599 CONFIG_ZLIB_INFLATE=y
1600 CONFIG_ZLIB_DEFLATE=m
1601 -CONFIG_LZO_COMPRESS=m
1602 -CONFIG_LZO_DECOMPRESS=m
1603 -CONFIG_DECOMPRESS_GZIP=y
1604 CONFIG_GENERIC_ALLOCATOR=y
1605 +CONFIG_PLIST=y
1606 CONFIG_HAS_IOMEM=y
1607 CONFIG_HAS_IOPORT=y
1608 CONFIG_HAS_DMA=y
1609 CONFIG_CHECK_SIGNATURE=y
1610 -CONFIG_NLATTR=y
1611
1612 Modified: trunk/releases/10.0/kconfig/x86/installcd-2.6.30.config
1613 ===================================================================
1614 --- trunk/releases/10.0/kconfig/x86/installcd-2.6.30.config 2009-09-09 16:58:27 UTC (rev 694)
1615 +++ trunk/releases/10.0/kconfig/x86/installcd-2.6.30.config 2009-09-11 00:46:47 UTC (rev 695)
1616 @@ -1,7 +1,7 @@
1617 #
1618 # Automatically generated make config: don't edit
1619 -# Linux kernel version: 2.6.30-gentoo-r6
1620 -# Thu Sep 3 21:03:56 2009
1621 +# Linux kernel version: 2.6.28-gentoo-r5
1622 +# Sun May 3 16:47:45 2009
1623 #
1624 # CONFIG_64BIT is not set
1625 CONFIG_X86_32=y
1626 @@ -33,7 +33,6 @@
1627 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
1628 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
1629 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
1630 -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
1631 # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
1632 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
1633 CONFIG_ARCH_SUSPEND_POSSIBLE=y
1634 @@ -41,16 +40,15 @@
1635 CONFIG_ARCH_POPULATES_NODE_MAP=y
1636 # CONFIG_AUDIT_ARCH is not set
1637 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
1638 -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
1639 CONFIG_GENERIC_HARDIRQS=y
1640 -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
1641 CONFIG_GENERIC_IRQ_PROBE=y
1642 CONFIG_GENERIC_PENDING_IRQ=y
1643 +CONFIG_X86_SMP=y
1644 CONFIG_USE_GENERIC_SMP_HELPERS=y
1645 CONFIG_X86_32_SMP=y
1646 CONFIG_X86_HT=y
1647 +CONFIG_X86_BIOS_REBOOT=y
1648 CONFIG_X86_TRAMPOLINE=y
1649 -CONFIG_X86_32_LAZY_GS=y
1650 CONFIG_KTIME_SCALAR=y
1651 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
1652
1653 @@ -62,12 +60,6 @@
1654 CONFIG_INIT_ENV_ARG_LIMIT=32
1655 CONFIG_LOCALVERSION=""
1656 # CONFIG_LOCALVERSION_AUTO is not set
1657 -CONFIG_HAVE_KERNEL_GZIP=y
1658 -CONFIG_HAVE_KERNEL_BZIP2=y
1659 -CONFIG_HAVE_KERNEL_LZMA=y
1660 -CONFIG_KERNEL_GZIP=y
1661 -# CONFIG_KERNEL_BZIP2 is not set
1662 -# CONFIG_KERNEL_LZMA is not set
1663 CONFIG_SWAP=y
1664 CONFIG_SYSVIPC=y
1665 CONFIG_SYSVIPC_SYSCTL=y
1666 @@ -75,29 +67,18 @@
1667 # CONFIG_BSD_PROCESS_ACCT is not set
1668 # CONFIG_TASKSTATS is not set
1669 # CONFIG_AUDIT is not set
1670 -
1671 -#
1672 -# RCU Subsystem
1673 -#
1674 -CONFIG_CLASSIC_RCU=y
1675 -# CONFIG_TREE_RCU is not set
1676 -# CONFIG_PREEMPT_RCU is not set
1677 -# CONFIG_TREE_RCU_TRACE is not set
1678 -# CONFIG_PREEMPT_RCU_TRACE is not set
1679 CONFIG_IKCONFIG=y
1680 CONFIG_IKCONFIG_PROC=y
1681 CONFIG_LOG_BUF_SHIFT=15
1682 +# CONFIG_CGROUPS is not set
1683 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
1684 # CONFIG_GROUP_SCHED is not set
1685 -# CONFIG_CGROUPS is not set
1686 -# CONFIG_SYSFS_DEPRECATED_V2 is not set
1687 +CONFIG_SYSFS_DEPRECATED=y
1688 +CONFIG_SYSFS_DEPRECATED_V2=y
1689 # CONFIG_RELAY is not set
1690 # CONFIG_NAMESPACES is not set
1691 CONFIG_BLK_DEV_INITRD=y
1692 CONFIG_INITRAMFS_SOURCE=""
1693 -CONFIG_RD_GZIP=y
1694 -# CONFIG_RD_BZIP2 is not set
1695 -# CONFIG_RD_LZMA is not set
1696 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1697 CONFIG_SYSCTL=y
1698 CONFIG_ANON_INODES=y
1699 @@ -107,7 +88,6 @@
1700 CONFIG_KALLSYMS=y
1701 # CONFIG_KALLSYMS_ALL is not set
1702 # CONFIG_KALLSYMS_EXTRA_PASS is not set
1703 -# CONFIG_STRIP_ASM_SYMS is not set
1704 CONFIG_HOTPLUG=y
1705 CONFIG_PRINTK=y
1706 CONFIG_BUG=y
1707 @@ -136,11 +116,10 @@
1708 CONFIG_HAVE_KPROBES=y
1709 CONFIG_HAVE_KRETPROBES=y
1710 CONFIG_HAVE_ARCH_TRACEHOOK=y
1711 -CONFIG_HAVE_DMA_API_DEBUG=y
1712 -# CONFIG_SLOW_WORK is not set
1713 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
1714 CONFIG_SLABINFO=y
1715 CONFIG_RT_MUTEXES=y
1716 +# CONFIG_TINY_SHMEM is not set
1717 CONFIG_BASE_SMALL=0
1718 CONFIG_MODULES=y
1719 # CONFIG_MODULE_FORCE_LOAD is not set
1720 @@ -148,9 +127,12 @@
1721 # CONFIG_MODULE_FORCE_UNLOAD is not set
1722 CONFIG_MODVERSIONS=y
1723 # CONFIG_MODULE_SRCVERSION_ALL is not set
1724 +CONFIG_KMOD=y
1725 CONFIG_STOP_MACHINE=y
1726 CONFIG_BLOCK=y
1727 CONFIG_LBD=y
1728 +# CONFIG_BLK_DEV_IO_TRACE is not set
1729 +CONFIG_LSF=y
1730 CONFIG_BLK_DEV_BSG=y
1731 # CONFIG_BLK_DEV_INTEGRITY is not set
1732
1733 @@ -166,6 +148,7 @@
1734 # CONFIG_DEFAULT_CFQ is not set
1735 # CONFIG_DEFAULT_NOOP is not set
1736 CONFIG_DEFAULT_IOSCHED="deadline"
1737 +CONFIG_CLASSIC_RCU=y
1738 # CONFIG_FREEZER is not set
1739
1740 #
1741 @@ -175,14 +158,15 @@
1742 # CONFIG_HIGH_RES_TIMERS is not set
1743 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
1744 CONFIG_SMP=y
1745 -# CONFIG_SPARSE_IRQ is not set
1746 +CONFIG_X86_FIND_SMP_CONFIG=y
1747 CONFIG_X86_MPPARSE=y
1748 -# CONFIG_X86_BIGSMP is not set
1749 -CONFIG_X86_EXTENDED_PLATFORM=y
1750 +CONFIG_X86_PC=y
1751 # CONFIG_X86_ELAN is not set
1752 +# CONFIG_X86_VOYAGER is not set
1753 +# CONFIG_X86_GENERICARCH is not set
1754 +# CONFIG_X86_VSMP is not set
1755 # CONFIG_X86_RDC321X is not set
1756 -# CONFIG_X86_32_NON_STANDARD is not set
1757 -CONFIG_SCHED_OMIT_FRAME_POINTER=y
1758 +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
1759 # CONFIG_PARAVIRT_GUEST is not set
1760 # CONFIG_MEMTEST is not set
1761 # CONFIG_M386 is not set
1762 @@ -212,10 +196,8 @@
1763 # CONFIG_GENERIC_CPU is not set
1764 CONFIG_X86_GENERIC=y
1765 CONFIG_X86_CPU=y
1766 -CONFIG_X86_L1_CACHE_BYTES=64
1767 -CONFIG_X86_INTERNODE_CACHE_BYTES=64
1768 CONFIG_X86_CMPXCHG=y
1769 -CONFIG_X86_L1_CACHE_SHIFT=4
1770 +CONFIG_X86_L1_CACHE_SHIFT=7
1771 CONFIG_X86_XADD=y
1772 CONFIG_X86_PPRO_FENCE=y
1773 CONFIG_X86_F00F_BUG=y
1774 @@ -230,14 +212,13 @@
1775 CONFIG_CPU_SUP_INTEL=y
1776 CONFIG_CPU_SUP_CYRIX_32=y
1777 CONFIG_CPU_SUP_AMD=y
1778 -CONFIG_CPU_SUP_CENTAUR=y
1779 +CONFIG_CPU_SUP_CENTAUR_32=y
1780 CONFIG_CPU_SUP_TRANSMETA_32=y
1781 CONFIG_CPU_SUP_UMC_32=y
1782 # CONFIG_HPET_TIMER is not set
1783 CONFIG_DMI=y
1784 # CONFIG_IOMMU_HELPER is not set
1785 -# CONFIG_IOMMU_API is not set
1786 -CONFIG_NR_CPUS=8
1787 +CONFIG_NR_CPUS=64
1788 CONFIG_SCHED_SMT=y
1789 CONFIG_SCHED_MC=y
1790 CONFIG_PREEMPT_NONE=y
1791 @@ -245,7 +226,6 @@
1792 # CONFIG_PREEMPT is not set
1793 CONFIG_X86_LOCAL_APIC=y
1794 CONFIG_X86_IO_APIC=y
1795 -# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
1796 CONFIG_X86_MCE=y
1797 CONFIG_X86_MCE_NONFATAL=y
1798 CONFIG_X86_MCE_P4THERMAL=y
1799 @@ -256,7 +236,6 @@
1800 # CONFIG_MICROCODE is not set
1801 # CONFIG_X86_MSR is not set
1802 # CONFIG_X86_CPUID is not set
1803 -# CONFIG_X86_CPU_DEBUG is not set
1804 # CONFIG_NOHIGHMEM is not set
1805 CONFIG_HIGHMEM4G=y
1806 # CONFIG_HIGHMEM64G is not set
1807 @@ -280,14 +259,12 @@
1808 CONFIG_SPARSEMEM_STATIC=y
1809 CONFIG_PAGEFLAGS_EXTENDED=y
1810 CONFIG_SPLIT_PTLOCK_CPUS=4
1811 +CONFIG_RESOURCES_64BIT=y
1812 # CONFIG_PHYS_ADDR_T_64BIT is not set
1813 CONFIG_ZONE_DMA_FLAG=1
1814 CONFIG_BOUNCE=y
1815 CONFIG_VIRT_TO_BUS=y
1816 CONFIG_UNEVICTABLE_LRU=y
1817 -CONFIG_HAVE_MLOCK=y
1818 -CONFIG_HAVE_MLOCKED_PAGE_BIT=y
1819 -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
1820 # CONFIG_HIGHPTE is not set
1821 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
1822 CONFIG_X86_RESERVE_LOW_64K=y
1823 @@ -297,7 +274,6 @@
1824 # CONFIG_X86_PAT is not set
1825 CONFIG_EFI=y
1826 CONFIG_SECCOMP=y
1827 -# CONFIG_CC_STACKPROTECTOR is not set
1828 CONFIG_HZ_100=y
1829 # CONFIG_HZ_250 is not set
1830 # CONFIG_HZ_300 is not set
1831 @@ -325,7 +301,7 @@
1832 # CONFIG_ACPI_PROCFS is not set
1833 # CONFIG_ACPI_PROCFS_POWER is not set
1834 CONFIG_ACPI_SYSFS_POWER=y
1835 -# CONFIG_ACPI_PROC_EVENT is not set
1836 +CONFIG_ACPI_PROC_EVENT=y
1837 CONFIG_ACPI_AC=m
1838 CONFIG_ACPI_BATTERY=m
1839 CONFIG_ACPI_BUTTON=m
1840 @@ -334,13 +310,17 @@
1841 CONFIG_ACPI_DOCK=y
1842 CONFIG_ACPI_PROCESSOR=m
1843 CONFIG_ACPI_THERMAL=m
1844 +# CONFIG_ACPI_WMI is not set
1845 +CONFIG_ACPI_ASUS=m
1846 +CONFIG_ACPI_TOSHIBA=m
1847 # CONFIG_ACPI_CUSTOM_DSDT is not set
1848 CONFIG_ACPI_BLACKLIST_YEAR=0
1849 # CONFIG_ACPI_DEBUG is not set
1850 # CONFIG_ACPI_PCI_SLOT is not set
1851 +CONFIG_ACPI_SYSTEM=y
1852 # CONFIG_X86_PM_TIMER is not set
1853 CONFIG_ACPI_CONTAINER=m
1854 -CONFIG_ACPI_SBS=m
1855 +# CONFIG_ACPI_SBS is not set
1856
1857 #
1858 # CPU Frequency scaling
1859 @@ -369,8 +349,10 @@
1860 CONFIG_X86_POWERNOW_K7=m
1861 CONFIG_X86_POWERNOW_K7_ACPI=y
1862 CONFIG_X86_POWERNOW_K8=m
1863 +CONFIG_X86_POWERNOW_K8_ACPI=y
1864 CONFIG_X86_GX_SUSPMOD=m
1865 -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
1866 +CONFIG_X86_SPEEDSTEP_CENTRINO=m
1867 +CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
1868 CONFIG_X86_SPEEDSTEP_ICH=m
1869 CONFIG_X86_SPEEDSTEP_SMI=m
1870 CONFIG_X86_P4_CLOCKMOD=m
1871 @@ -382,6 +364,7 @@
1872 #
1873 # shared options
1874 #
1875 +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
1876 CONFIG_X86_SPEEDSTEP_LIB=m
1877 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
1878 CONFIG_CPU_IDLE=y
1879 @@ -408,9 +391,7 @@
1880 # CONFIG_PCI_MSI is not set
1881 CONFIG_PCI_LEGACY=y
1882 # CONFIG_PCI_DEBUG is not set
1883 -# CONFIG_PCI_STUB is not set
1884 CONFIG_HT_IRQ=y
1885 -# CONFIG_PCI_IOV is not set
1886 CONFIG_ISA_DMA_API=y
1887 CONFIG_ISA=y
1888 CONFIG_EISA=y
1889 @@ -422,7 +403,6 @@
1890 CONFIG_SCx200=m
1891 CONFIG_SCx200HR_TIMER=m
1892 CONFIG_OLPC=y
1893 -CONFIG_K8_NB=y
1894 CONFIG_PCCARD=m
1895 # CONFIG_PCMCIA_DEBUG is not set
1896 CONFIG_PCMCIA=m
1897 @@ -492,7 +472,7 @@
1898 CONFIG_INET_XFRM_MODE_TRANSPORT=m
1899 CONFIG_INET_XFRM_MODE_TUNNEL=m
1900 CONFIG_INET_XFRM_MODE_BEET=m
1901 -CONFIG_INET_LRO=y
1902 +CONFIG_INET_LRO=m
1903 # CONFIG_INET_DIAG is not set
1904 # CONFIG_TCP_CONG_ADVANCED is not set
1905 CONFIG_TCP_CONG_CUBIC=y
1906 @@ -526,7 +506,6 @@
1907 # CONFIG_SCTP_HMAC_NONE is not set
1908 # CONFIG_SCTP_HMAC_SHA1 is not set
1909 CONFIG_SCTP_HMAC_MD5=y
1910 -# CONFIG_RDS is not set
1911 # CONFIG_TIPC is not set
1912 CONFIG_ATM=m
1913 CONFIG_ATM_CLIP=m
1914 @@ -547,9 +526,7 @@
1915 # CONFIG_LAPB is not set
1916 # CONFIG_ECONET is not set
1917 # CONFIG_WAN_ROUTER is not set
1918 -# CONFIG_PHONET is not set
1919 # CONFIG_NET_SCHED is not set
1920 -# CONFIG_DCB is not set
1921
1922 #
1923 # Network testing
1924 @@ -566,13 +543,14 @@
1925 CONFIG_BT_BNEP=m
1926 CONFIG_BT_BNEP_MC_FILTER=y
1927 CONFIG_BT_BNEP_PROTO_FILTER=y
1928 -# CONFIG_BT_CMTP is not set
1929 CONFIG_BT_HIDP=m
1930
1931 #
1932 # Bluetooth device drivers
1933 #
1934 -CONFIG_BT_HCIBTUSB=m
1935 +CONFIG_BT_HCIUSB=m
1936 +CONFIG_BT_HCIUSB_SCO=y
1937 +# CONFIG_BT_HCIBTUSB is not set
1938 CONFIG_BT_HCIUART=m
1939 CONFIG_BT_HCIUART_H4=y
1940 CONFIG_BT_HCIUART_BCSP=y
1941 @@ -586,17 +564,13 @@
1942 CONFIG_BT_HCIBTUART=m
1943 CONFIG_BT_HCIVHCI=m
1944 # CONFIG_AF_RXRPC is not set
1945 +# CONFIG_PHONET is not set
1946 CONFIG_WIRELESS=y
1947 CONFIG_CFG80211=m
1948 -# CONFIG_CFG80211_REG_DEBUG is not set
1949 +# CONFIG_NL80211 is not set
1950 CONFIG_WIRELESS_OLD_REGULATORY=y
1951 CONFIG_WIRELESS_EXT=y
1952 CONFIG_WIRELESS_EXT_SYSFS=y
1953 -CONFIG_LIB80211=m
1954 -CONFIG_LIB80211_CRYPT_WEP=m
1955 -CONFIG_LIB80211_CRYPT_CCMP=m
1956 -CONFIG_LIB80211_CRYPT_TKIP=m
1957 -# CONFIG_LIB80211_DEBUG is not set
1958 CONFIG_MAC80211=m
1959
1960 #
1961 @@ -610,7 +584,11 @@
1962 # CONFIG_MAC80211_MESH is not set
1963 CONFIG_MAC80211_LEDS=y
1964 # CONFIG_MAC80211_DEBUG_MENU is not set
1965 -# CONFIG_WIMAX is not set
1966 +CONFIG_IEEE80211=m
1967 +# CONFIG_IEEE80211_DEBUG is not set
1968 +CONFIG_IEEE80211_CRYPT_WEP=m
1969 +CONFIG_IEEE80211_CRYPT_CCMP=m
1970 +CONFIG_IEEE80211_CRYPT_TKIP=m
1971 CONFIG_RFKILL=m
1972 CONFIG_RFKILL_INPUT=m
1973 CONFIG_RFKILL_LEDS=y
1974 @@ -669,31 +647,37 @@
1975 CONFIG_MISC_DEVICES=y
1976 # CONFIG_IBM_ASM is not set
1977 # CONFIG_PHANTOM is not set
1978 +CONFIG_EEPROM_93CX6=m
1979 # CONFIG_SGI_IOC4 is not set
1980 # CONFIG_TIFM_CORE is not set
1981 +# CONFIG_ACER_WMI is not set
1982 +# CONFIG_ASUS_LAPTOP is not set
1983 +CONFIG_FUJITSU_LAPTOP=m
1984 +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
1985 +# CONFIG_TC1100_WMI is not set
1986 # CONFIG_ICS932S401 is not set
1987 +CONFIG_MSI_LAPTOP=m
1988 +# CONFIG_PANASONIC_LAPTOP is not set
1989 +# CONFIG_COMPAL_LAPTOP is not set
1990 +CONFIG_SONY_LAPTOP=m
1991 +CONFIG_SONYPI_COMPAT=y
1992 +CONFIG_THINKPAD_ACPI=m
1993 +# CONFIG_THINKPAD_ACPI_DEBUG is not set
1994 +CONFIG_THINKPAD_ACPI_BAY=y
1995 +CONFIG_THINKPAD_ACPI_VIDEO=y
1996 +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
1997 +# CONFIG_INTEL_MENLOW is not set
1998 +CONFIG_EEEPC_LAPTOP=m
1999 # CONFIG_ENCLOSURE_SERVICES is not set
2000 # CONFIG_HP_ILO is not set
2001 -# CONFIG_DELL_LAPTOP is not set
2002 -# CONFIG_ISL29003 is not set
2003 # CONFIG_C2PORT is not set
2004 -
2005 -#
2006 -# EEPROM support
2007 -#
2008 -# CONFIG_EEPROM_AT24 is not set
2009 -# CONFIG_EEPROM_LEGACY is not set
2010 -CONFIG_EEPROM_93CX6=m
2011 CONFIG_HAVE_IDE=y
2012 CONFIG_IDE=y
2013
2014 #
2015 # Please see Documentation/ide/ide.txt for help/info on IDE drives
2016 #
2017 -CONFIG_IDE_XFER_MODE=y
2018 CONFIG_IDE_TIMINGS=y
2019 -CONFIG_IDE_ATAPI=y
2020 -CONFIG_IDE_LEGACY=y
2021 # CONFIG_BLK_DEV_IDE_SATA is not set
2022 CONFIG_IDE_GD=y
2023 CONFIG_IDE_GD_ATA=y
2024 @@ -703,6 +687,7 @@
2025 CONFIG_BLK_DEV_IDECD=y
2026 CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
2027 # CONFIG_BLK_DEV_IDETAPE is not set
2028 +# CONFIG_BLK_DEV_IDESCSI is not set
2029 CONFIG_BLK_DEV_IDEACPI=y
2030 CONFIG_IDE_TASK_IOCTL=y
2031 CONFIG_IDE_PROC_FS=y
2032 @@ -736,12 +721,10 @@
2033 CONFIG_BLK_DEV_CS5520=y
2034 CONFIG_BLK_DEV_CS5530=y
2035 CONFIG_BLK_DEV_CS5535=y
2036 -# CONFIG_BLK_DEV_CS5536 is not set
2037 CONFIG_BLK_DEV_HPT366=y
2038 CONFIG_BLK_DEV_JMICRON=y
2039 CONFIG_BLK_DEV_SC1200=y
2040 CONFIG_BLK_DEV_PIIX=y
2041 -# CONFIG_BLK_DEV_IT8172 is not set
2042 # CONFIG_BLK_DEV_IT8213 is not set
2043 CONFIG_BLK_DEV_IT821X=y
2044 CONFIG_BLK_DEV_NS87415=y
2045 @@ -816,7 +799,6 @@
2046 CONFIG_SCSI_SRP_TGT_ATTRS=y
2047 CONFIG_SCSI_LOWLEVEL=y
2048 CONFIG_ISCSI_TCP=y
2049 -# CONFIG_SCSI_CXGB3_ISCSI is not set
2050 CONFIG_BLK_DEV_3W_XXXX_RAID=m
2051 CONFIG_SCSI_3W_9XXX=m
2052 CONFIG_SCSI_7000FASST=m
2053 @@ -850,14 +832,9 @@
2054 CONFIG_MEGARAID_MAILBOX=m
2055 CONFIG_MEGARAID_LEGACY=m
2056 CONFIG_MEGARAID_SAS=m
2057 -# CONFIG_SCSI_MPT2SAS is not set
2058 CONFIG_SCSI_HPTIOP=m
2059 CONFIG_SCSI_BUSLOGIC=m
2060 # CONFIG_SCSI_FLASHPOINT is not set
2061 -# CONFIG_LIBFC is not set
2062 -# CONFIG_LIBFCOE is not set
2063 -# CONFIG_FCOE is not set
2064 -# CONFIG_FCOE_FNIC is not set
2065 CONFIG_SCSI_DMX3191D=m
2066 CONFIG_SCSI_DTC3280=m
2067 CONFIG_SCSI_EATA=m
2068 @@ -908,7 +885,6 @@
2069 CONFIG_PCMCIA_QLOGIC=m
2070 CONFIG_PCMCIA_SYM53C500=m
2071 # CONFIG_SCSI_DH is not set
2072 -# CONFIG_SCSI_OSD_INITIATOR is not set
2073 CONFIG_ATA=m
2074 # CONFIG_ATA_NONSTANDARD is not set
2075 CONFIG_ATA_ACPI=y
2076 @@ -941,7 +917,7 @@
2077 CONFIG_PATA_CS5530=m
2078 CONFIG_PATA_CS5535=m
2079 CONFIG_PATA_CS5536=m
2080 -CONFIG_PATA_CYPRESS=m
2081 +# CONFIG_PATA_CYPRESS is not set
2082 CONFIG_PATA_EFAR=m
2083 CONFIG_ATA_GENERIC=m
2084 CONFIG_PATA_HPT366=m
2085 @@ -959,7 +935,7 @@
2086 CONFIG_PATA_MPIIX=m
2087 # CONFIG_PATA_OLDPIIX is not set
2088 CONFIG_PATA_NETCELL=m
2089 -CONFIG_PATA_NINJA32=m
2090 +# CONFIG_PATA_NINJA32 is not set
2091 CONFIG_PATA_NS87410=m
2092 CONFIG_PATA_NS87415=m
2093 CONFIG_PATA_OPTI=m
2094 @@ -987,7 +963,7 @@
2095 CONFIG_MD_RAID1=m
2096 CONFIG_MD_RAID10=m
2097 CONFIG_MD_RAID456=m
2098 -CONFIG_MD_RAID6_PQ=m
2099 +CONFIG_MD_RAID5_RESHAPE=y
2100 CONFIG_MD_MULTIPATH=m
2101 CONFIG_MD_FAULTY=m
2102 CONFIG_BLK_DEV_DM=m
2103 @@ -1040,7 +1016,6 @@
2104 CONFIG_MACINTOSH_DRIVERS=y
2105 CONFIG_MAC_EMUMOUSEBTN=y
2106 CONFIG_NETDEVICES=y
2107 -CONFIG_COMPAT_NET_DEV_OPS=y
2108 # CONFIG_DUMMY is not set
2109 CONFIG_BONDING=m
2110 # CONFIG_MACVLAN is not set
2111 @@ -1064,9 +1039,6 @@
2112 CONFIG_BROADCOM_PHY=m
2113 CONFIG_ICPLUS_PHY=m
2114 CONFIG_REALTEK_PHY=m
2115 -# CONFIG_NATIONAL_PHY is not set
2116 -# CONFIG_STE10XP is not set
2117 -# CONFIG_LSI_ET1011C_PHY is not set
2118 CONFIG_MDIO_BITBANG=m
2119 CONFIG_NET_ETHERNET=y
2120 CONFIG_MII=y
2121 @@ -1088,11 +1060,9 @@
2122 CONFIG_ULTRA=m
2123 CONFIG_ULTRA32=m
2124 CONFIG_SMC9194=m
2125 -CONFIG_ETHOC=m
2126 CONFIG_NET_VENDOR_RACAL=y
2127 CONFIG_NI52=m
2128 CONFIG_NI65=m
2129 -CONFIG_DNET=m
2130 CONFIG_NET_TULIP=y
2131 CONFIG_DE2104X=m
2132 CONFIG_TULIP=m
2133 @@ -1140,6 +1110,7 @@
2134 CONFIG_FORCEDETH=m
2135 CONFIG_FORCEDETH_NAPI=y
2136 CONFIG_CS89x0=m
2137 +CONFIG_EEPRO100=m
2138 CONFIG_E100=m
2139 CONFIG_LNE390=m
2140 CONFIG_FEALNX=m
2141 @@ -1153,10 +1124,9 @@
2142 CONFIG_8139TOO_TUNE_TWISTER=y
2143 CONFIG_8139TOO_8129=y
2144 # CONFIG_8139_OLD_RX_RESET is not set
2145 -CONFIG_R6040=m
2146 +# CONFIG_R6040 is not set
2147 CONFIG_SIS900=m
2148 CONFIG_EPIC100=m
2149 -CONFIG_SMSC9420=m
2150 CONFIG_SUNDANCE=m
2151 CONFIG_SUNDANCE_MMIO=y
2152 CONFIG_TLAN=m
2153 @@ -1172,8 +1142,8 @@
2154 CONFIG_E1000E=m
2155 CONFIG_IP1000=m
2156 CONFIG_IGB=m
2157 +# CONFIG_IGB_LRO is not set
2158 CONFIG_IGB_DCA=y
2159 -# CONFIG_IGBVF is not set
2160 CONFIG_NS83820=m
2161 CONFIG_HAMACHI=m
2162 CONFIG_YELLOWFIN=m
2163 @@ -1188,19 +1158,16 @@
2164 CONFIG_QLA3XXX=m
2165 CONFIG_ATL1=m
2166 CONFIG_ATL1E=m
2167 -# CONFIG_ATL1C is not set
2168 CONFIG_JME=y
2169 CONFIG_NETDEV_10000=y
2170 CONFIG_CHELSIO_T1=m
2171 CONFIG_CHELSIO_T1_1G=y
2172 -CONFIG_CHELSIO_T3_DEPENDS=y
2173 CONFIG_CHELSIO_T3=m
2174 # CONFIG_ENIC is not set
2175 CONFIG_IXGBE=m
2176 CONFIG_IXGBE_DCA=y
2177 CONFIG_IXGB=m
2178 CONFIG_S2IO=m
2179 -# CONFIG_VXGE is not set
2180 CONFIG_MYRI10GE=m
2181 CONFIG_MYRI10GE_DCA=y
2182 CONFIG_NETXEN_NIC=m
2183 @@ -1212,7 +1179,6 @@
2184 CONFIG_BNX2X=m
2185 # CONFIG_QLGE is not set
2186 CONFIG_SFC=m
2187 -# CONFIG_BE2NET is not set
2188 # CONFIG_TR is not set
2189
2190 #
2191 @@ -1221,16 +1187,31 @@
2192 # CONFIG_WLAN_PRE80211 is not set
2193 CONFIG_WLAN_80211=y
2194 # CONFIG_PCMCIA_RAYCS is not set
2195 +CONFIG_IPW2100=m
2196 +CONFIG_IPW2100_MONITOR=y
2197 +# CONFIG_IPW2100_DEBUG is not set
2198 +CONFIG_IPW2200=m
2199 +CONFIG_IPW2200_MONITOR=y
2200 +CONFIG_IPW2200_RADIOTAP=y
2201 +CONFIG_IPW2200_PROMISCUOUS=y
2202 +CONFIG_IPW2200_QOS=y
2203 +# CONFIG_IPW2200_DEBUG is not set
2204 CONFIG_LIBERTAS=m
2205 CONFIG_LIBERTAS_USB=m
2206 CONFIG_LIBERTAS_CS=m
2207 # CONFIG_LIBERTAS_DEBUG is not set
2208 # CONFIG_LIBERTAS_THINFIRM is not set
2209 CONFIG_AIRO=m
2210 +CONFIG_HERMES=m
2211 +CONFIG_PLX_HERMES=m
2212 +CONFIG_TMD_HERMES=m
2213 +CONFIG_NORTEL_HERMES=m
2214 +CONFIG_PCI_HERMES=m
2215 +CONFIG_PCMCIA_HERMES=m
2216 +CONFIG_PCMCIA_SPECTRUM=m
2217 CONFIG_ATMEL=m
2218 CONFIG_PCI_ATMEL=m
2219 CONFIG_PCMCIA_ATMEL=m
2220 -# CONFIG_AT76C50X_USB is not set
2221 CONFIG_AIRO_CS=m
2222 CONFIG_PCMCIA_WL3501=m
2223 CONFIG_PRISM54=m
2224 @@ -1240,37 +1221,27 @@
2225 CONFIG_RTL8187=m
2226 CONFIG_ADM8211=m
2227 # CONFIG_MAC80211_HWSIM is not set
2228 -# CONFIG_MWL8K is not set
2229 CONFIG_P54_COMMON=m
2230 CONFIG_P54_USB=m
2231 CONFIG_P54_PCI=m
2232 -CONFIG_P54_LEDS=y
2233 CONFIG_ATH5K=m
2234 # CONFIG_ATH5K_DEBUG is not set
2235 CONFIG_ATH9K=m
2236 -# CONFIG_ATH9K_DEBUG is not set
2237 -# CONFIG_AR9170_USB is not set
2238 -CONFIG_IPW2100=m
2239 -CONFIG_IPW2100_MONITOR=y
2240 -# CONFIG_IPW2100_DEBUG is not set
2241 -CONFIG_IPW2200=m
2242 -CONFIG_IPW2200_MONITOR=y
2243 -CONFIG_IPW2200_RADIOTAP=y
2244 -CONFIG_IPW2200_PROMISCUOUS=y
2245 -CONFIG_IPW2200_QOS=y
2246 -# CONFIG_IPW2200_DEBUG is not set
2247 -CONFIG_LIBIPW=m
2248 -# CONFIG_LIBIPW_DEBUG is not set
2249 CONFIG_IWLWIFI=m
2250 +CONFIG_IWLCORE=m
2251 CONFIG_IWLWIFI_LEDS=y
2252 CONFIG_IWLWIFI_RFKILL=y
2253 -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
2254 # CONFIG_IWLWIFI_DEBUG is not set
2255 CONFIG_IWLAGN=m
2256 +# CONFIG_IWLAGN_SPECTRUM_MEASUREMENT is not set
2257 +CONFIG_IWLAGN_LEDS=y
2258 CONFIG_IWL4965=y
2259 CONFIG_IWL5000=y
2260 CONFIG_IWL3945=m
2261 +CONFIG_IWL3945_RFKILL=y
2262 # CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
2263 +CONFIG_IWL3945_LEDS=y
2264 +CONFIG_IWL3945_DEBUG=y
2265 CONFIG_HOSTAP=m
2266 CONFIG_HOSTAP_FIRMWARE=y
2267 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
2268 @@ -1312,20 +1283,8 @@
2269 CONFIG_RT2X00_LIB_RFKILL=y
2270 CONFIG_RT2X00_LIB_LEDS=y
2271 # CONFIG_RT2X00_DEBUG is not set
2272 -CONFIG_HERMES=m
2273 -CONFIG_HERMES_CACHE_FW_ON_INIT=y
2274 -CONFIG_PLX_HERMES=m
2275 -CONFIG_TMD_HERMES=m
2276 -CONFIG_NORTEL_HERMES=m
2277 -CONFIG_PCI_HERMES=m
2278 -CONFIG_PCMCIA_HERMES=m
2279 -CONFIG_PCMCIA_SPECTRUM=m
2280
2281 #
2282 -# Enable WiMAX (Networking options) to see the WiMAX drivers
2283 -#
2284 -
2285 -#
2286 # USB Network Adapters
2287 #
2288 CONFIG_USB_CATC=m
2289 @@ -1335,7 +1294,6 @@
2290 CONFIG_USB_USBNET=m
2291 CONFIG_USB_NET_AX8817X=m
2292 CONFIG_USB_NET_CDCETHER=m
2293 -# CONFIG_USB_NET_CDC_EEM is not set
2294 CONFIG_USB_NET_DM9601=m
2295 CONFIG_USB_NET_SMSC95XX=m
2296 CONFIG_USB_NET_GL620A=m
2297 @@ -1419,7 +1377,6 @@
2298 CONFIG_ATM_FORE200E_DEBUG=0
2299 CONFIG_ATM_HE=m
2300 CONFIG_ATM_HE_USE_SUNI=y
2301 -# CONFIG_ATM_SOLOS is not set
2302 CONFIG_FDDI=y
2303 CONFIG_DEFXX=m
2304 # CONFIG_DEFXX_MMIO is not set
2305 @@ -1448,43 +1405,7 @@
2306 # CONFIG_NETPOLL is not set
2307 # CONFIG_NET_POLL_CONTROLLER is not set
2308 CONFIG_VIRTIO_NET=m
2309 -CONFIG_ISDN=y
2310 -CONFIG_MISDN=m
2311 -CONFIG_MISDN_DSP=m
2312 -CONFIG_MISDN_L1OIP=m
2313 -
2314 -#
2315 -# mISDN hardware drivers
2316 -#
2317 -CONFIG_MISDN_HFCPCI=m
2318 -CONFIG_MISDN_HFCMULTI=m
2319 -CONFIG_MISDN_HFCUSB=m
2320 -# CONFIG_ISDN_I4L is not set
2321 -CONFIG_ISDN_CAPI=m
2322 -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
2323 -CONFIG_CAPI_TRACE=y
2324 -# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
2325 -CONFIG_ISDN_CAPI_CAPI20=m
2326 -
2327 -#
2328 -# CAPI hardware drivers
2329 -#
2330 -CONFIG_CAPI_AVM=y
2331 -CONFIG_ISDN_DRV_AVMB1_B1ISA=m
2332 -CONFIG_ISDN_DRV_AVMB1_B1PCI=m
2333 -# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
2334 -CONFIG_ISDN_DRV_AVMB1_T1ISA=m
2335 -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
2336 -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
2337 -CONFIG_ISDN_DRV_AVMB1_T1PCI=m
2338 -CONFIG_ISDN_DRV_AVMB1_C4=m
2339 -CONFIG_CAPI_EICON=y
2340 -CONFIG_ISDN_DIVAS=m
2341 -CONFIG_ISDN_DIVAS_BRIPCI=y
2342 -CONFIG_ISDN_DIVAS_PRIPCI=y
2343 -CONFIG_ISDN_DIVAS_DIVACAPI=m
2344 -CONFIG_ISDN_DIVAS_USERIDI=m
2345 -CONFIG_ISDN_DIVAS_MAINT=m
2346 +# CONFIG_ISDN is not set
2347 # CONFIG_PHONE is not set
2348
2349 #
2350 @@ -1534,12 +1455,7 @@
2351 CONFIG_MOUSE_PC110PAD=m
2352 # CONFIG_MOUSE_VSXXXAA is not set
2353 # CONFIG_INPUT_JOYSTICK is not set
2354 -CONFIG_INPUT_TABLET=y
2355 -# CONFIG_TABLET_USB_ACECAD is not set
2356 -# CONFIG_TABLET_USB_AIPTEK is not set
2357 -# CONFIG_TABLET_USB_GTCO is not set
2358 -# CONFIG_TABLET_USB_KBTAB is not set
2359 -CONFIG_TABLET_USB_WACOM=m
2360 +# CONFIG_INPUT_TABLET is not set
2361 # CONFIG_INPUT_TOUCHSCREEN is not set
2362 # CONFIG_INPUT_MISC is not set
2363
2364 @@ -1596,7 +1512,6 @@
2365 CONFIG_SERIAL_CORE_CONSOLE=y
2366 # CONFIG_SERIAL_JSM is not set
2367 CONFIG_UNIX98_PTYS=y
2368 -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
2369 # CONFIG_LEGACY_PTYS is not set
2370 # CONFIG_VIRTIO_CONSOLE is not set
2371 CONFIG_IPMI_HANDLER=m
2372 @@ -1607,7 +1522,6 @@
2373 CONFIG_IPMI_WATCHDOG=m
2374 CONFIG_IPMI_POWEROFF=m
2375 CONFIG_HW_RANDOM=y
2376 -# CONFIG_HW_RANDOM_TIMERIOMEM is not set
2377 CONFIG_HW_RANDOM_INTEL=y
2378 CONFIG_HW_RANDOM_AMD=y
2379 CONFIG_HW_RANDOM_GEODE=y
2380 @@ -1698,9 +1612,12 @@
2381 # Miscellaneous I2C Chip support
2382 #
2383 # CONFIG_DS1682 is not set
2384 +# CONFIG_AT24 is not set
2385 +# CONFIG_SENSORS_EEPROM is not set
2386 # CONFIG_SENSORS_PCF8574 is not set
2387 # CONFIG_PCF8575 is not set
2388 # CONFIG_SENSORS_PCA9539 is not set
2389 +# CONFIG_SENSORS_PCF8591 is not set
2390 # CONFIG_SENSORS_MAX6875 is not set
2391 # CONFIG_SENSORS_TSL2550 is not set
2392 # CONFIG_I2C_DEBUG_CORE is not set
2393 @@ -1732,10 +1649,8 @@
2394 # CONFIG_SENSORS_ADT7462 is not set
2395 # CONFIG_SENSORS_ADT7470 is not set
2396 # CONFIG_SENSORS_ADT7473 is not set
2397 -# CONFIG_SENSORS_ADT7475 is not set
2398 # CONFIG_SENSORS_K8TEMP is not set
2399 # CONFIG_SENSORS_ASB100 is not set
2400 -# CONFIG_SENSORS_ATK0110 is not set
2401 # CONFIG_SENSORS_ATXP1 is not set
2402 # CONFIG_SENSORS_DS1621 is not set
2403 # CONFIG_SENSORS_I5K_AMB is not set
2404 @@ -1745,12 +1660,9 @@
2405 # CONFIG_SENSORS_FSCHER is not set
2406 # CONFIG_SENSORS_FSCPOS is not set
2407 # CONFIG_SENSORS_FSCHMD is not set
2408 -# CONFIG_SENSORS_G760A is not set
2409 # CONFIG_SENSORS_GL518SM is not set
2410 # CONFIG_SENSORS_GL520SM is not set
2411 # CONFIG_SENSORS_CORETEMP is not set
2412 -# CONFIG_SENSORS_IBMAEM is not set
2413 -# CONFIG_SENSORS_IBMPEX is not set
2414 # CONFIG_SENSORS_IT87 is not set
2415 # CONFIG_SENSORS_LM63 is not set
2416 # CONFIG_SENSORS_LM75 is not set
2417 @@ -1763,14 +1675,10 @@
2418 # CONFIG_SENSORS_LM90 is not set
2419 # CONFIG_SENSORS_LM92 is not set
2420 # CONFIG_SENSORS_LM93 is not set
2421 -# CONFIG_SENSORS_LTC4215 is not set
2422 -# CONFIG_SENSORS_LTC4245 is not set
2423 -# CONFIG_SENSORS_LM95241 is not set
2424 # CONFIG_SENSORS_MAX1619 is not set
2425 # CONFIG_SENSORS_MAX6650 is not set
2426 # CONFIG_SENSORS_PC87360 is not set
2427 # CONFIG_SENSORS_PC87427 is not set
2428 -# CONFIG_SENSORS_PCF8591 is not set
2429 # CONFIG_SENSORS_SIS5595 is not set
2430 # CONFIG_SENSORS_DME1737 is not set
2431 # CONFIG_SENSORS_SMSC47M1 is not set
2432 @@ -1823,7 +1731,6 @@
2433 # CONFIG_MFD_TMIO is not set
2434 # CONFIG_MFD_WM8400 is not set
2435 # CONFIG_MFD_WM8350_I2C is not set
2436 -# CONFIG_MFD_PCF50633 is not set
2437 # CONFIG_REGULATOR is not set
2438
2439 #
2440 @@ -1833,168 +1740,20 @@
2441 #
2442 # Multimedia core support
2443 #
2444 -CONFIG_VIDEO_DEV=m
2445 -CONFIG_VIDEO_V4L2_COMMON=m
2446 -CONFIG_VIDEO_ALLOW_V4L1=y
2447 -CONFIG_VIDEO_V4L1_COMPAT=y
2448 +# CONFIG_VIDEO_DEV is not set
2449 # CONFIG_DVB_CORE is not set
2450 -CONFIG_VIDEO_MEDIA=m
2451 +# CONFIG_VIDEO_MEDIA is not set
2452
2453 #
2454 # Multimedia drivers
2455 #
2456 -# CONFIG_MEDIA_ATTACH is not set
2457 -CONFIG_MEDIA_TUNER=m
2458 -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
2459 -CONFIG_MEDIA_TUNER_SIMPLE=m
2460 -CONFIG_MEDIA_TUNER_TDA8290=m
2461 -CONFIG_MEDIA_TUNER_TDA9887=m
2462 -CONFIG_MEDIA_TUNER_TEA5761=m
2463 -CONFIG_MEDIA_TUNER_TEA5767=m
2464 -CONFIG_MEDIA_TUNER_MT20XX=m
2465 -CONFIG_MEDIA_TUNER_XC2028=m
2466 -CONFIG_MEDIA_TUNER_XC5000=m
2467 -CONFIG_MEDIA_TUNER_MC44S803=m
2468 -CONFIG_VIDEO_V4L2=m
2469 -CONFIG_VIDEO_V4L1=m
2470 -CONFIG_VIDEOBUF_GEN=m
2471 -CONFIG_VIDEOBUF_VMALLOC=m
2472 -CONFIG_VIDEO_IR=m
2473 -CONFIG_VIDEO_TVEEPROM=m
2474 -CONFIG_VIDEO_TUNER=m
2475 -CONFIG_VIDEO_CAPTURE_DRIVERS=y
2476 -# CONFIG_VIDEO_ADV_DEBUG is not set
2477 -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
2478 -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
2479 -CONFIG_VIDEO_IR_I2C=m
2480 -CONFIG_VIDEO_MSP3400=m
2481 -CONFIG_VIDEO_CS53L32A=m
2482 -CONFIG_VIDEO_WM8775=m
2483 -CONFIG_VIDEO_SAA711X=m
2484 -CONFIG_VIDEO_CX25840=m
2485 -CONFIG_VIDEO_CX2341X=m
2486 -# CONFIG_VIDEO_VIVI is not set
2487 -# CONFIG_VIDEO_BT848 is not set
2488 -# CONFIG_VIDEO_PMS is not set
2489 -# CONFIG_VIDEO_CPIA is not set
2490 -# CONFIG_VIDEO_CPIA2 is not set
2491 -# CONFIG_VIDEO_SAA5246A is not set
2492 -# CONFIG_VIDEO_SAA5249 is not set
2493 -# CONFIG_VIDEO_STRADIS is not set
2494 -# CONFIG_VIDEO_ZORAN is not set
2495 -# CONFIG_VIDEO_MEYE is not set
2496 -# CONFIG_VIDEO_SAA7134 is not set
2497 -# CONFIG_VIDEO_MXB is not set
2498 -# CONFIG_VIDEO_HEXIUM_ORION is not set
2499 -# CONFIG_VIDEO_HEXIUM_GEMINI is not set
2500 -# CONFIG_VIDEO_CX88 is not set
2501 -# CONFIG_VIDEO_IVTV is not set
2502 -# CONFIG_VIDEO_CAFE_CCIC is not set
2503 -# CONFIG_SOC_CAMERA is not set
2504 -CONFIG_V4L_USB_DRIVERS=y
2505 -CONFIG_USB_VIDEO_CLASS=m
2506 -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
2507 -CONFIG_USB_GSPCA=m
2508 -# CONFIG_USB_M5602 is not set
2509 -# CONFIG_USB_STV06XX is not set
2510 -# CONFIG_USB_GSPCA_CONEX is not set
2511 -# CONFIG_USB_GSPCA_ETOMS is not set
2512 -# CONFIG_USB_GSPCA_FINEPIX is not set
2513 -# CONFIG_USB_GSPCA_MARS is not set
2514 -# CONFIG_USB_GSPCA_MR97310A is not set
2515 -# CONFIG_USB_GSPCA_OV519 is not set
2516 -# CONFIG_USB_GSPCA_OV534 is not set
2517 -# CONFIG_USB_GSPCA_PAC207 is not set
2518 -# CONFIG_USB_GSPCA_PAC7311 is not set
2519 -# CONFIG_USB_GSPCA_SONIXB is not set
2520 -# CONFIG_USB_GSPCA_SONIXJ is not set
2521 -# CONFIG_USB_GSPCA_SPCA500 is not set
2522 -# CONFIG_USB_GSPCA_SPCA501 is not set
2523 -# CONFIG_USB_GSPCA_SPCA505 is not set
2524 -# CONFIG_USB_GSPCA_SPCA506 is not set
2525 -# CONFIG_USB_GSPCA_SPCA508 is not set
2526 -# CONFIG_USB_GSPCA_SPCA561 is not set
2527 -# CONFIG_USB_GSPCA_SQ905 is not set
2528 -# CONFIG_USB_GSPCA_SQ905C is not set
2529 -# CONFIG_USB_GSPCA_STK014 is not set
2530 -# CONFIG_USB_GSPCA_SUNPLUS is not set
2531 -# CONFIG_USB_GSPCA_T613 is not set
2532 -# CONFIG_USB_GSPCA_TV8532 is not set
2533 -# CONFIG_USB_GSPCA_VC032X is not set
2534 -# CONFIG_USB_GSPCA_ZC3XX is not set
2535 -CONFIG_VIDEO_PVRUSB2=m
2536 -CONFIG_VIDEO_PVRUSB2_SYSFS=y
2537 -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
2538 -CONFIG_VIDEO_HDPVR=m
2539 -# CONFIG_VIDEO_EM28XX is not set
2540 -CONFIG_VIDEO_CX231XX=m
2541 -# CONFIG_VIDEO_CX231XX_ALSA is not set
2542 -# CONFIG_VIDEO_USBVISION is not set
2543 -CONFIG_VIDEO_USBVIDEO=m
2544 -# CONFIG_USB_VICAM is not set
2545 -# CONFIG_USB_IBMCAM is not set
2546 -# CONFIG_USB_KONICAWC is not set
2547 -CONFIG_USB_QUICKCAM_MESSENGER=m
2548 -# CONFIG_USB_ET61X251 is not set
2549 -# CONFIG_VIDEO_OVCAMCHIP is not set
2550 -# CONFIG_USB_OV511 is not set
2551 -# CONFIG_USB_SE401 is not set
2552 -# CONFIG_USB_SN9C102 is not set
2553 -# CONFIG_USB_STV680 is not set
2554 -# CONFIG_USB_ZC0301 is not set
2555 -CONFIG_USB_PWC=m
2556 -# CONFIG_USB_PWC_DEBUG is not set
2557 -CONFIG_USB_PWC_INPUT_EVDEV=y
2558 -# CONFIG_USB_ZR364XX is not set
2559 -# CONFIG_USB_STKWEBCAM is not set
2560 -# CONFIG_USB_S2255 is not set
2561 -CONFIG_RADIO_ADAPTERS=y
2562 -# CONFIG_RADIO_CADET is not set
2563 -# CONFIG_RADIO_RTRACK is not set
2564 -# CONFIG_RADIO_RTRACK2 is not set
2565 -# CONFIG_RADIO_AZTECH is not set
2566 -# CONFIG_RADIO_GEMTEK is not set
2567 -# CONFIG_RADIO_GEMTEK_PCI is not set
2568 -# CONFIG_RADIO_MAXIRADIO is not set
2569 -# CONFIG_RADIO_MAESTRO is not set
2570 -# CONFIG_RADIO_SF16FMI is not set
2571 -# CONFIG_RADIO_SF16FMR2 is not set
2572 -# CONFIG_RADIO_TERRATEC is not set
2573 -# CONFIG_RADIO_TRUST is not set
2574 -# CONFIG_RADIO_TYPHOON is not set
2575 -# CONFIG_RADIO_ZOLTRIX is not set
2576 -# CONFIG_USB_DSBR is not set
2577 -# CONFIG_USB_SI470X is not set
2578 -# CONFIG_USB_MR800 is not set
2579 -# CONFIG_RADIO_TEA5764 is not set
2580 # CONFIG_DAB is not set
2581
2582 #
2583 # Graphics support
2584 #
2585 -CONFIG_AGP=m
2586 -CONFIG_AGP_ALI=m
2587 -CONFIG_AGP_ATI=m
2588 -CONFIG_AGP_AMD=m
2589 -CONFIG_AGP_AMD64=m
2590 -CONFIG_AGP_INTEL=m
2591 -CONFIG_AGP_NVIDIA=m
2592 -CONFIG_AGP_SIS=m
2593 -CONFIG_AGP_SWORKS=m
2594 -CONFIG_AGP_VIA=m
2595 -CONFIG_AGP_EFFICEON=m
2596 -CONFIG_DRM=m
2597 -CONFIG_DRM_TDFX=m
2598 -CONFIG_DRM_R128=m
2599 -CONFIG_DRM_RADEON=m
2600 -CONFIG_DRM_I810=m
2601 -CONFIG_DRM_I830=m
2602 -CONFIG_DRM_I915=m
2603 -# CONFIG_DRM_I915_KMS is not set
2604 -CONFIG_DRM_MGA=m
2605 -CONFIG_DRM_SIS=m
2606 -CONFIG_DRM_VIA=m
2607 -CONFIG_DRM_SAVAGE=m
2608 +# CONFIG_AGP is not set
2609 +# CONFIG_DRM is not set
2610 # CONFIG_VGASTATE is not set
2611 CONFIG_VIDEO_OUTPUT_CONTROL=m
2612 CONFIG_FB=y
2613 @@ -2049,6 +1808,7 @@
2614 # CONFIG_FB_3DFX is not set
2615 # CONFIG_FB_VOODOO1 is not set
2616 # CONFIG_FB_VT8623 is not set
2617 +# CONFIG_FB_CYBLA is not set
2618 # CONFIG_FB_TRIDENT is not set
2619 # CONFIG_FB_ARK is not set
2620 # CONFIG_FB_PM3 is not set
2621 @@ -2057,13 +1817,12 @@
2622 # CONFIG_FB_VIRTUAL is not set
2623 # CONFIG_FB_METRONOME is not set
2624 # CONFIG_FB_MB862XX is not set
2625 -# CONFIG_FB_BROADSHEET is not set
2626 CONFIG_BACKLIGHT_LCD_SUPPORT=y
2627 CONFIG_LCD_CLASS_DEVICE=m
2628 # CONFIG_LCD_ILI9320 is not set
2629 # CONFIG_LCD_PLATFORM is not set
2630 CONFIG_BACKLIGHT_CLASS_DEVICE=m
2631 -CONFIG_BACKLIGHT_GENERIC=m
2632 +# CONFIG_BACKLIGHT_CORGI is not set
2633 # CONFIG_BACKLIGHT_PROGEAR is not set
2634 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
2635 # CONFIG_BACKLIGHT_SAHARA is not set
2636 @@ -2098,7 +1857,6 @@
2637 CONFIG_SND_PCM=m
2638 CONFIG_SND_HWDEP=m
2639 CONFIG_SND_RAWMIDI=m
2640 -CONFIG_SND_JACK=y
2641 CONFIG_SND_SEQUENCER=m
2642 # CONFIG_SND_SEQ_DUMMY is not set
2643 CONFIG_SND_OSSEMUL=y
2644 @@ -2138,6 +1896,7 @@
2645 CONFIG_SND_AZT2320=m
2646 CONFIG_SND_CMI8330=m
2647 CONFIG_SND_CS4231=m
2648 +CONFIG_SND_CS4232=m
2649 CONFIG_SND_CS4236=m
2650 CONFIG_SND_DT019X=m
2651 CONFIG_SND_ES968=m
2652 @@ -2161,8 +1920,7 @@
2653 CONFIG_SND_SGALAXY=m
2654 CONFIG_SND_SSCAPE=m
2655 CONFIG_SND_WAVEFRONT=m
2656 -CONFIG_SND_MSND_PINNACLE=m
2657 -# CONFIG_SND_MSND_CLASSIC is not set
2658 +CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y
2659 CONFIG_SND_PCI=y
2660 CONFIG_SND_AD1889=m
2661 CONFIG_SND_ALS300=m
2662 @@ -2198,8 +1956,6 @@
2663 CONFIG_SND_INDIGO=m
2664 CONFIG_SND_INDIGOIO=m
2665 CONFIG_SND_INDIGODJ=m
2666 -CONFIG_SND_INDIGOIOX=m
2667 -CONFIG_SND_INDIGODJX=m
2668 CONFIG_SND_EMU10K1=m
2669 CONFIG_SND_EMU10K1X=m
2670 CONFIG_SND_ENS1370=m
2671 @@ -2207,7 +1963,6 @@
2672 CONFIG_SND_ES1938=m
2673 CONFIG_SND_ES1968=m
2674 CONFIG_SND_FM801=m
2675 -# CONFIG_SND_FM801_TEA575X_BOOL is not set
2676 CONFIG_SND_HDA_INTEL=m
2677 # CONFIG_SND_HDA_HWDEP is not set
2678 # CONFIG_SND_HDA_INPUT_BEEP is not set
2679 @@ -2217,8 +1972,6 @@
2680 CONFIG_SND_HDA_CODEC_VIA=y
2681 CONFIG_SND_HDA_CODEC_ATIHDMI=y
2682 CONFIG_SND_HDA_CODEC_NVHDMI=y
2683 -CONFIG_SND_HDA_CODEC_INTELHDMI=y
2684 -CONFIG_SND_HDA_ELD=y
2685 CONFIG_SND_HDA_CODEC_CONEXANT=y
2686 CONFIG_SND_HDA_CODEC_CMEDIA=y
2687 CONFIG_SND_HDA_CODEC_SI3054=y
2688 @@ -2259,7 +2012,6 @@
2689 CONFIG_SND_VXPOCKET=m
2690 CONFIG_SND_PDAUDIOCF=m
2691 CONFIG_SND_SOC=m
2692 -CONFIG_SND_SOC_I2C_AND_SPI=m
2693 # CONFIG_SND_SOC_ALL_CODECS is not set
2694 # CONFIG_SOUND_PRIME is not set
2695 CONFIG_AC97_BUS=m
2696 @@ -2284,31 +2036,28 @@
2697 #
2698 # Special HID drivers
2699 #
2700 +CONFIG_HID_COMPAT=y
2701 CONFIG_HID_A4TECH=m
2702 CONFIG_HID_APPLE=m
2703 CONFIG_HID_BELKIN=m
2704 +CONFIG_HID_BRIGHT=m
2705 CONFIG_HID_CHERRY=m
2706 CONFIG_HID_CHICONY=m
2707 CONFIG_HID_CYPRESS=m
2708 -# CONFIG_DRAGONRISE_FF is not set
2709 +CONFIG_HID_DELL=m
2710 CONFIG_HID_EZKEY=m
2711 -# CONFIG_HID_KYE is not set
2712 CONFIG_HID_GYRATION=m
2713 -# CONFIG_HID_KENSINGTON is not set
2714 CONFIG_HID_LOGITECH=m
2715 # CONFIG_LOGITECH_FF is not set
2716 # CONFIG_LOGIRUMBLEPAD2_FF is not set
2717 CONFIG_HID_MICROSOFT=m
2718 CONFIG_HID_MONTEREY=m
2719 -# CONFIG_HID_NTRIG is not set
2720 CONFIG_HID_PANTHERLORD=m
2721 # CONFIG_PANTHERLORD_FF is not set
2722 CONFIG_HID_PETALYNX=m
2723 CONFIG_HID_SAMSUNG=m
2724 CONFIG_HID_SONY=m
2725 CONFIG_HID_SUNPLUS=m
2726 -# CONFIG_GREENASIA_FF is not set
2727 -# CONFIG_HID_TOPSEED is not set
2728 # CONFIG_THRUSTMASTER_FF is not set
2729 # CONFIG_ZEROPLUS_FF is not set
2730 CONFIG_USB_SUPPORT=y
2731 @@ -2329,7 +2078,7 @@
2732 # CONFIG_USB_OTG is not set
2733 # CONFIG_USB_OTG_WHITELIST is not set
2734 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
2735 -CONFIG_USB_MON=m
2736 +# CONFIG_USB_MON is not set
2737 # CONFIG_USB_WUSB is not set
2738 # CONFIG_USB_WUSB_CBAF is not set
2739
2740 @@ -2340,7 +2089,6 @@
2741 CONFIG_USB_EHCI_HCD=m
2742 CONFIG_USB_EHCI_ROOT_HUB_TT=y
2743 CONFIG_USB_EHCI_TT_NEWSCHED=y
2744 -# CONFIG_USB_OXU210HP_HCD is not set
2745 CONFIG_USB_ISP116X_HCD=m
2746 # CONFIG_USB_ISP1760_HCD is not set
2747 CONFIG_USB_OHCI_HCD=m
2748 @@ -2364,29 +2112,30 @@
2749 # USB Device Class drivers
2750 #
2751 CONFIG_USB_ACM=m
2752 -CONFIG_USB_PRINTER=m
2753 +# CONFIG_USB_PRINTER is not set
2754 # CONFIG_USB_WDM is not set
2755 # CONFIG_USB_TMC is not set
2756
2757 #
2758 -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
2759 +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
2760 #
2761
2762 #
2763 -# also be needed; see USB_STORAGE Help for more info
2764 +# see USB_STORAGE Help for more information
2765 #
2766 CONFIG_USB_STORAGE=m
2767 CONFIG_USB_STORAGE_DEBUG=y
2768 -CONFIG_USB_STORAGE_DATAFAB=m
2769 -CONFIG_USB_STORAGE_FREECOM=m
2770 -CONFIG_USB_STORAGE_ISD200=m
2771 -CONFIG_USB_STORAGE_USBAT=m
2772 -CONFIG_USB_STORAGE_SDDR09=m
2773 -CONFIG_USB_STORAGE_SDDR55=m
2774 -CONFIG_USB_STORAGE_JUMPSHOT=m
2775 -CONFIG_USB_STORAGE_ALAUDA=m
2776 +CONFIG_USB_STORAGE_DATAFAB=y
2777 +CONFIG_USB_STORAGE_FREECOM=y
2778 +CONFIG_USB_STORAGE_ISD200=y
2779 +CONFIG_USB_STORAGE_DPCM=y
2780 +CONFIG_USB_STORAGE_USBAT=y
2781 +CONFIG_USB_STORAGE_SDDR09=y
2782 +CONFIG_USB_STORAGE_SDDR55=y
2783 +CONFIG_USB_STORAGE_JUMPSHOT=y
2784 +CONFIG_USB_STORAGE_ALAUDA=y
2785 # CONFIG_USB_STORAGE_ONETOUCH is not set
2786 -CONFIG_USB_STORAGE_KARMA=m
2787 +CONFIG_USB_STORAGE_KARMA=y
2788 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
2789 # CONFIG_USB_LIBUSUAL is not set
2790
2791 @@ -2415,6 +2164,7 @@
2792 # CONFIG_USB_LED is not set
2793 # CONFIG_USB_CYPRESS_CY7C63 is not set
2794 # CONFIG_USB_CYTHERM is not set
2795 +# CONFIG_USB_PHIDGET is not set
2796 # CONFIG_USB_IDMOUSE is not set
2797 CONFIG_USB_FTDI_ELAN=m
2798 # CONFIG_USB_APPLEDISPLAY is not set
2799 @@ -2432,11 +2182,6 @@
2800 CONFIG_USB_UEAGLEATM=m
2801 CONFIG_USB_XUSBATM=m
2802 # CONFIG_USB_GADGET is not set
2803 -
2804 -#
2805 -# OTG and related infrastructure
2806 -#
2807 -# CONFIG_NOP_USB_XCEIV is not set
2808 # CONFIG_UWB is not set
2809 # CONFIG_MMC is not set
2810 # CONFIG_MEMSTICK is not set
2811 @@ -2446,12 +2191,10 @@
2812 #
2813 # LED drivers
2814 #
2815 -# CONFIG_LEDS_ALIX2 is not set
2816 # CONFIG_LEDS_PCA9532 is not set
2817 -# CONFIG_LEDS_LP5521 is not set
2818 +# CONFIG_LEDS_HP_DISK is not set
2819 # CONFIG_LEDS_CLEVO_MAIL is not set
2820 # CONFIG_LEDS_PCA955X is not set
2821 -# CONFIG_LEDS_BD2802 is not set
2822
2823 #
2824 # LED Triggers
2825 @@ -2462,10 +2205,6 @@
2826 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
2827 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
2828 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
2829 -
2830 -#
2831 -# iptables trigger is under Netfilter config (LED target)
2832 -#
2833 # CONFIG_ACCESSIBILITY is not set
2834 CONFIG_INFINIBAND=m
2835 # CONFIG_INFINIBAND_USER_MAD is not set
2836 @@ -2498,40 +2237,15 @@
2837 # DMA Clients
2838 #
2839 CONFIG_NET_DMA=y
2840 -# CONFIG_ASYNC_TX_DMA is not set
2841 # CONFIG_DMATEST is not set
2842 CONFIG_DCA=y
2843 -# CONFIG_AUXDISPLAY is not set
2844 CONFIG_UIO=m
2845 # CONFIG_UIO_CIF is not set
2846 # CONFIG_UIO_PDRV is not set
2847 # CONFIG_UIO_PDRV_GENIRQ is not set
2848 # CONFIG_UIO_SMX is not set
2849 -# CONFIG_UIO_AEC is not set
2850 # CONFIG_UIO_SERCOS3 is not set
2851 # CONFIG_STAGING is not set
2852 -CONFIG_X86_PLATFORM_DEVICES=y
2853 -# CONFIG_ACER_WMI is not set
2854 -# CONFIG_ASUS_LAPTOP is not set
2855 -CONFIG_FUJITSU_LAPTOP=m
2856 -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
2857 -# CONFIG_TC1100_WMI is not set
2858 -CONFIG_MSI_LAPTOP=m
2859 -# CONFIG_PANASONIC_LAPTOP is not set
2860 -# CONFIG_COMPAL_LAPTOP is not set
2861 -CONFIG_SONY_LAPTOP=m
2862 -CONFIG_SONYPI_COMPAT=y
2863 -CONFIG_THINKPAD_ACPI=m
2864 -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
2865 -# CONFIG_THINKPAD_ACPI_DEBUG is not set
2866 -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
2867 -CONFIG_THINKPAD_ACPI_VIDEO=y
2868 -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
2869 -# CONFIG_INTEL_MENLOW is not set
2870 -CONFIG_EEEPC_LAPTOP=m
2871 -# CONFIG_ACPI_WMI is not set
2872 -CONFIG_ACPI_ASUS=m
2873 -CONFIG_ACPI_TOSHIBA=m
2874
2875 #
2876 # Firmware Drivers
2877 @@ -2553,12 +2267,11 @@
2878 CONFIG_EXT2_FS_SECURITY=y
2879 # CONFIG_EXT2_FS_XIP is not set
2880 CONFIG_EXT3_FS=y
2881 -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
2882 CONFIG_EXT3_FS_XATTR=y
2883 CONFIG_EXT3_FS_POSIX_ACL=y
2884 CONFIG_EXT3_FS_SECURITY=y
2885 CONFIG_EXT4_FS=y
2886 -# CONFIG_EXT4DEV_COMPAT is not set
2887 +CONFIG_EXT4DEV_COMPAT=y
2888 CONFIG_EXT4_FS_XATTR=y
2889 CONFIG_EXT4_FS_POSIX_ACL=y
2890 CONFIG_EXT4_FS_SECURITY=y
2891 @@ -2577,31 +2290,25 @@
2892 # CONFIG_JFS_DEBUG is not set
2893 # CONFIG_JFS_STATISTICS is not set
2894 CONFIG_FS_POSIX_ACL=y
2895 -CONFIG_XFS_FS=m
2896 +CONFIG_FILE_LOCKING=y
2897 +CONFIG_XFS_FS=y
2898 CONFIG_XFS_QUOTA=y
2899 CONFIG_XFS_POSIX_ACL=y
2900 CONFIG_XFS_RT=y
2901 # CONFIG_XFS_DEBUG is not set
2902 CONFIG_GFS2_FS=m
2903 -# CONFIG_GFS2_FS_LOCKING_DLM is not set
2904 +CONFIG_GFS2_FS_LOCKING_DLM=m
2905 CONFIG_OCFS2_FS=m
2906 CONFIG_OCFS2_FS_O2CB=m
2907 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
2908 CONFIG_OCFS2_FS_STATS=y
2909 CONFIG_OCFS2_DEBUG_MASKLOG=y
2910 # CONFIG_OCFS2_DEBUG_FS is not set
2911 -# CONFIG_OCFS2_FS_POSIX_ACL is not set
2912 -# CONFIG_BTRFS_FS is not set
2913 -CONFIG_FILE_LOCKING=y
2914 +# CONFIG_OCFS2_COMPAT_JBD is not set
2915 CONFIG_DNOTIFY=y
2916 CONFIG_INOTIFY=y
2917 CONFIG_INOTIFY_USER=y
2918 -CONFIG_QUOTA=y
2919 -# CONFIG_QUOTA_NETLINK_INTERFACE is not set
2920 -CONFIG_PRINT_QUOTA_WARNING=y
2921 -CONFIG_QUOTA_TREE=m
2922 -# CONFIG_QFMT_V1 is not set
2923 -# CONFIG_QFMT_V2 is not set
2924 +# CONFIG_QUOTA is not set
2925 CONFIG_QUOTACTL=y
2926 # CONFIG_AUTOFS_FS is not set
2927 # CONFIG_AUTOFS4_FS is not set
2928 @@ -2609,11 +2316,6 @@
2929 CONFIG_GENERIC_ACL=y
2930
2931 #
2932 -# Caches
2933 -#
2934 -# CONFIG_FSCACHE is not set
2935 -
2936 -#
2937 # CD-ROM/DVD Filesystems
2938 #
2939 CONFIG_ISO9660_FS=y
2940 @@ -2647,7 +2349,10 @@
2941 # CONFIG_HUGETLBFS is not set
2942 # CONFIG_HUGETLB_PAGE is not set
2943 CONFIG_CONFIGFS_FS=m
2944 -CONFIG_MISC_FILESYSTEMS=y
2945 +
2946 +#
2947 +# Miscellaneous filesystems
2948 +#
2949 # CONFIG_ADFS_FS is not set
2950 # CONFIG_AFFS_FS is not set
2951 CONFIG_HFS_FS=y
2952 @@ -2667,7 +2372,6 @@
2953 # CONFIG_ROMFS_FS is not set
2954 # CONFIG_SYSV_FS is not set
2955 # CONFIG_UFS_FS is not set
2956 -CONFIG_NILFS2_FS=m
2957 CONFIG_NETWORK_FILESYSTEMS=y
2958 CONFIG_NFS_FS=y
2959 CONFIG_NFS_V3=y
2960 @@ -2677,12 +2381,12 @@
2961 # CONFIG_NFSD is not set
2962 CONFIG_LOCKD=y
2963 CONFIG_LOCKD_V4=y
2964 -CONFIG_EXPORTFS=m
2965 CONFIG_NFS_ACL_SUPPORT=y
2966 CONFIG_NFS_COMMON=y
2967 CONFIG_SUNRPC=y
2968 CONFIG_SUNRPC_GSS=y
2969 CONFIG_SUNRPC_XPRT_RDMA=m
2970 +# CONFIG_SUNRPC_REGISTER_V4 is not set
2971 CONFIG_RPCSEC_GSS_KRB5=y
2972 CONFIG_RPCSEC_GSS_SPKM3=m
2973 # CONFIG_SMB_FS is not set
2974 @@ -2767,7 +2471,7 @@
2975 #
2976 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
2977 # CONFIG_PRINTK_TIME is not set
2978 -# CONFIG_ENABLE_WARN_DEPRECATED is not set
2979 +CONFIG_ENABLE_WARN_DEPRECATED=y
2980 CONFIG_ENABLE_MUST_CHECK=y
2981 CONFIG_FRAME_WARN=1024
2982 CONFIG_MAGIC_SYSRQ=y
2983 @@ -2779,9 +2483,6 @@
2984 CONFIG_DETECT_SOFTLOCKUP=y
2985 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
2986 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
2987 -CONFIG_DETECT_HUNG_TASK=y
2988 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
2989 -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
2990 CONFIG_SCHED_DEBUG=y
2991 # CONFIG_SCHEDSTATS is not set
2992 # CONFIG_TIMER_STATS is not set
2993 @@ -2806,8 +2507,6 @@
2994 # CONFIG_DEBUG_MEMORY_INIT is not set
2995 # CONFIG_DEBUG_LIST is not set
2996 # CONFIG_DEBUG_SG is not set
2997 -# CONFIG_DEBUG_NOTIFIERS is not set
2998 -CONFIG_ARCH_WANT_FRAME_POINTERS=y
2999 # CONFIG_FRAME_POINTER is not set
3000 # CONFIG_BOOT_PRINTK_DELAY is not set
3001 # CONFIG_RCU_TORTURE_TEST is not set
3002 @@ -2817,15 +2516,9 @@
3003 # CONFIG_FAULT_INJECTION is not set
3004 # CONFIG_LATENCYTOP is not set
3005 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
3006 -# CONFIG_DEBUG_PAGEALLOC is not set
3007 -CONFIG_USER_STACKTRACE_SUPPORT=y
3008 CONFIG_HAVE_FUNCTION_TRACER=y
3009 -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
3010 -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
3011 CONFIG_HAVE_DYNAMIC_FTRACE=y
3012 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
3013 -CONFIG_HAVE_FTRACE_SYSCALLS=y
3014 -CONFIG_TRACING_SUPPORT=y
3015
3016 #
3017 # Tracers
3018 @@ -2835,18 +2528,10 @@
3019 # CONFIG_SYSPROF_TRACER is not set
3020 # CONFIG_SCHED_TRACER is not set
3021 # CONFIG_CONTEXT_SWITCH_TRACER is not set
3022 -# CONFIG_EVENT_TRACER is not set
3023 -# CONFIG_FTRACE_SYSCALLS is not set
3024 # CONFIG_BOOT_TRACER is not set
3025 -# CONFIG_TRACE_BRANCH_PROFILING is not set
3026 -# CONFIG_POWER_TRACER is not set
3027 # CONFIG_STACK_TRACER is not set
3028 -# CONFIG_KMEMTRACE is not set
3029 -# CONFIG_WORKQUEUE_TRACER is not set
3030 -# CONFIG_BLK_DEV_IO_TRACE is not set
3031 -# CONFIG_MMIOTRACE is not set
3032 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
3033 -# CONFIG_DMA_API_DEBUG is not set
3034 +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
3035 # CONFIG_SAMPLES is not set
3036 CONFIG_HAVE_ARCH_KGDB=y
3037 # CONFIG_KGDB is not set
3038 @@ -2856,6 +2541,7 @@
3039 # CONFIG_EARLY_PRINTK_DBGP is not set
3040 # CONFIG_DEBUG_STACKOVERFLOW is not set
3041 # CONFIG_DEBUG_STACK_USAGE is not set
3042 +# CONFIG_DEBUG_PAGEALLOC is not set
3043 # CONFIG_DEBUG_PER_CPU_MAPS is not set
3044 # CONFIG_X86_PTDUMP is not set
3045 CONFIG_DEBUG_RODATA=y
3046 @@ -2863,7 +2549,7 @@
3047 # CONFIG_DEBUG_NX_TEST is not set
3048 # CONFIG_4KSTACKS is not set
3049 CONFIG_DOUBLEFAULT=y
3050 -CONFIG_HAVE_MMIOTRACE_SUPPORT=y
3051 +# CONFIG_MMIOTRACE is not set
3052 CONFIG_IO_DELAY_TYPE_0X80=0
3053 CONFIG_IO_DELAY_TYPE_0XED=1
3054 CONFIG_IO_DELAY_TYPE_UDELAY=2
3055 @@ -2883,7 +2569,6 @@
3056 # CONFIG_SECURITY is not set
3057 # CONFIG_SECURITYFS is not set
3058 CONFIG_SECURITY_FILE_CAPABILITIES=y
3059 -# CONFIG_IMA is not set
3060 CONFIG_XOR_BLOCKS=m
3061 CONFIG_ASYNC_CORE=m
3062 CONFIG_ASYNC_MEMCPY=m
3063 @@ -2903,12 +2588,10 @@
3064 CONFIG_CRYPTO_HASH=y
3065 CONFIG_CRYPTO_HASH2=y
3066 CONFIG_CRYPTO_RNG2=y
3067 -CONFIG_CRYPTO_PCOMP=y
3068 CONFIG_CRYPTO_MANAGER=y
3069 CONFIG_CRYPTO_MANAGER2=y
3070 CONFIG_CRYPTO_GF128MUL=m
3071 CONFIG_CRYPTO_NULL=m
3072 -CONFIG_CRYPTO_WORKQUEUE=y
3073 CONFIG_CRYPTO_CRYPTD=m
3074 CONFIG_CRYPTO_AUTHENC=m
3075 CONFIG_CRYPTO_TEST=m
3076 @@ -2947,8 +2630,8 @@
3077 CONFIG_CRYPTO_MICHAEL_MIC=m
3078 # CONFIG_CRYPTO_RMD128 is not set
3079 # CONFIG_CRYPTO_RMD160 is not set
3080 -CONFIG_CRYPTO_RMD256=m
3081 -CONFIG_CRYPTO_RMD320=m
3082 +# CONFIG_CRYPTO_RMD256 is not set
3083 +# CONFIG_CRYPTO_RMD320 is not set
3084 CONFIG_CRYPTO_SHA1=m
3085 CONFIG_CRYPTO_SHA256=m
3086 CONFIG_CRYPTO_SHA512=m
3087 @@ -2969,8 +2652,8 @@
3088 CONFIG_CRYPTO_DES=y
3089 CONFIG_CRYPTO_FCRYPT=m
3090 CONFIG_CRYPTO_KHAZAD=m
3091 -CONFIG_CRYPTO_SALSA20=m
3092 -CONFIG_CRYPTO_SALSA20_586=m
3093 +# CONFIG_CRYPTO_SALSA20 is not set
3094 +# CONFIG_CRYPTO_SALSA20_586 is not set
3095 CONFIG_CRYPTO_SEED=m
3096 CONFIG_CRYPTO_SERPENT=m
3097 CONFIG_CRYPTO_TEA=m
3098 @@ -2982,8 +2665,7 @@
3099 # Compression
3100 #
3101 CONFIG_CRYPTO_DEFLATE=m
3102 -CONFIG_CRYPTO_ZLIB=m
3103 -CONFIG_CRYPTO_LZO=m
3104 +# CONFIG_CRYPTO_LZO is not set
3105
3106 #
3107 # Random Number Generation
3108 @@ -2996,7 +2678,6 @@
3109 CONFIG_CRYPTO_DEV_GEODE=m
3110 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
3111 CONFIG_HAVE_KVM=y
3112 -CONFIG_HAVE_KVM_IRQCHIP=y
3113 CONFIG_VIRTUALIZATION=y
3114 # CONFIG_KVM is not set
3115 # CONFIG_LGUEST is not set
3116 @@ -3004,7 +2685,6 @@
3117 CONFIG_VIRTIO_RING=m
3118 CONFIG_VIRTIO_PCI=m
3119 CONFIG_VIRTIO_BALLOON=m
3120 -# CONFIG_BINARY_PRINTF is not set
3121
3122 #
3123 # Library routines
3124 @@ -3012,7 +2692,6 @@
3125 CONFIG_BITREVERSE=y
3126 CONFIG_GENERIC_FIND_FIRST_BIT=y
3127 CONFIG_GENERIC_FIND_NEXT_BIT=y
3128 -CONFIG_GENERIC_FIND_LAST_BIT=y
3129 CONFIG_CRC_CCITT=m
3130 CONFIG_CRC16=y
3131 # CONFIG_CRC_T10DIF is not set
3132 @@ -3022,12 +2701,9 @@
3133 CONFIG_LIBCRC32C=y
3134 CONFIG_ZLIB_INFLATE=y
3135 CONFIG_ZLIB_DEFLATE=m
3136 -CONFIG_LZO_COMPRESS=m
3137 -CONFIG_LZO_DECOMPRESS=m
3138 -CONFIG_DECOMPRESS_GZIP=y
3139 CONFIG_GENERIC_ALLOCATOR=y
3140 +CONFIG_PLIST=y
3141 CONFIG_HAS_IOMEM=y
3142 CONFIG_HAS_IOPORT=y
3143 CONFIG_HAS_DMA=y
3144 CONFIG_CHECK_SIGNATURE=y
3145 -CONFIG_NLATTR=y
3146
3147 Added: trunk/releases/10.0/livecd/root_overlay/etc/env.d/90xsession
3148 ===================================================================
3149 --- trunk/releases/10.0/livecd/root_overlay/etc/env.d/90xsession (rev 0)
3150 +++ trunk/releases/10.0/livecd/root_overlay/etc/env.d/90xsession 2009-09-11 00:46:47 UTC (rev 695)
3151 @@ -0,0 +1 @@
3152 +XSESSION="kde-4.3"
3153
3154 Modified: trunk/releases/10.0/portage/package.keywords/kde-4.3.keywords
3155 ===================================================================
3156 --- trunk/releases/10.0/portage/package.keywords/kde-4.3.keywords 2009-09-09 16:58:27 UTC (rev 694)
3157 +++ trunk/releases/10.0/portage/package.keywords/kde-4.3.keywords 2009-09-11 00:46:47 UTC (rev 695)
3158 @@ -305,4 +305,3 @@
3159 ~sys-auth/policykit-0.9
3160 ~sys-auth/policykit-qt-0.9.2
3161 ~x11-misc/xdg-utils-1.0.2
3162 -
3163
3164 Modified: trunk/releases/10.0/portage/package.keywords/keywords
3165 ===================================================================
3166 --- trunk/releases/10.0/portage/package.keywords/keywords 2009-09-09 16:58:27 UTC (rev 694)
3167 +++ trunk/releases/10.0/portage/package.keywords/keywords 2009-09-11 00:46:47 UTC (rev 695)
3168 @@ -43,3 +43,4 @@
3169 dev-util/kdevelop
3170 dev-util/kdevplatform
3171 net-im/licq
3172 +app-arch/libarchive
3173
3174 Modified: trunk/releases/10.0/specs/amd64/livedvd-stage1.spec
3175 ===================================================================
3176 --- trunk/releases/10.0/specs/amd64/livedvd-stage1.spec 2009-09-09 16:58:27 UTC (rev 694)
3177 +++ trunk/releases/10.0/specs/amd64/livedvd-stage1.spec 2009-09-11 00:46:47 UTC (rev 695)
3178 @@ -15,20 +15,20 @@
3179 gnome
3180 qt4
3181 livecd/packages:
3182 - dev-util/qt-creator
3183 - dev-util/kdevelop
3184 - dev-util/kdesvn
3185 - dev-util/qgit
3186 - kde-misc/yakuake
3187 - net-irc/quassel
3188 - net-irc/konversation
3189 - net-im/kmess
3190 - www-client/arora
3191 - app-backup/luckybackup
3192 - net-im/qtwitter
3193 - media-sound/qmmp
3194 - app-cdr/k9copy
3195 - kde-misc/konq-plugins
3196 + dev-util/qt-creator
3197 + dev-util/kdevelop
3198 + dev-util/kdesvn
3199 + dev-util/qgit
3200 + kde-misc/yakuake
3201 + net-irc/quassel
3202 + net-irc/konversation
3203 + net-im/kmess
3204 + www-client/arora
3205 + app-backup/luckybackup
3206 + net-im/qtwitter
3207 + media-sound/qmmp
3208 + app-cdr/k9copy
3209 + kde-misc/konq-plugins
3210 x11-terms/terminal
3211 app-editors/mousepad
3212 x11-themes/xfce4-icon-theme
3213 @@ -45,7 +45,6 @@
3214 sys-block/partitionmanager
3215 sys-block/tw_cli
3216 kde-base/kde-meta
3217 - kde-base/kdebase-meta
3218 gnome-base/gnome
3219 x11-proto/dri2proto
3220 net-misc/wicd
3221
3222 Modified: trunk/releases/10.0/specs/amd64/livedvd-stage2.spec
3223 ===================================================================
3224 --- trunk/releases/10.0/specs/amd64/livedvd-stage2.spec 2009-09-09 16:58:27 UTC (rev 694)
3225 +++ trunk/releases/10.0/specs/amd64/livedvd-stage2.spec 2009-09-11 00:46:47 UTC (rev 695)
3226 @@ -26,7 +26,7 @@
3227 boot/kernel: gentoo
3228 boot/kernel/gentoo/sources: gentoo-sources
3229 boot/kernel/gentoo/config: /var/svnroot/releng/trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config
3230 -boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
3231 +boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb portaudio
3232 boot/kernel/gentoo/packages:
3233 # keywords.
3234 # net-wireless/rt73-firmware
3235
3236 Modified: trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec
3237 ===================================================================
3238 --- trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec 2009-09-09 16:58:27 UTC (rev 694)
3239 +++ trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec 2009-09-11 00:46:47 UTC (rev 695)
3240 @@ -3,7 +3,7 @@
3241 target: livecd-stage1
3242 rel_type: default
3243 profile: default/linux/x86/10.0/desktop
3244 -snapshot: 20090905
3245 +snapshot: 20090910
3246 source_subpath: default/stage3-i686-desktop-10.0
3247 portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage
3248
3249 @@ -14,6 +14,12 @@
3250 socks5
3251 gnome
3252 qt4
3253 + atm
3254 + fbcondecor
3255 + mng
3256 + png
3257 + truetype
3258 + usb
3259 livecd/packages:
3260 dev-util/qt-creator
3261 dev-util/kdevelop
3262 @@ -152,7 +158,6 @@
3263 app-arch/cfv
3264 # keywords.
3265 # app-arch/lzip
3266 - app-arch/lzma-utils
3267 app-arch/p7zip
3268 app-arch/pbzip2
3269 # keywords.
3270 @@ -228,7 +233,6 @@
3271 # keywords.
3272 # sys-fs/btrfs-progs
3273 sys-process/atop
3274 - sys-process/iotop
3275 www-client/elinks
3276 # keywords.
3277 # net-p2p/frostwire
3278
3279 Modified: trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec
3280 ===================================================================
3281 --- trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec 2009-09-09 16:58:27 UTC (rev 694)
3282 +++ trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec 2009-09-11 00:46:47 UTC (rev 695)
3283 @@ -3,9 +3,10 @@
3284 target: livecd-stage2
3285 rel_type: default
3286 profile: default/linux/x86/10.0/desktop
3287 -snapshot: 20090905
3288 +snapshot: 20090906
3289 source_subpath: default/livecd-stage1-i686-10.0
3290
3291 +livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
3292 livecd/bootargs: dokeymap
3293 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
3294 livecd/fstype: squashfs
3295 @@ -13,8 +14,8 @@
3296 livecd/iso: /var/tmp/catalyst/builds/default/livedvd-i686-10.0.iso
3297 livecd/type: gentoo-release-livedvd
3298 livecd/volid: Gentoo Linux 10.0 x86 LiveDVD
3299 -livecd/xdm: gdm
3300 -livecd/xsession: gnome
3301 +livecd/xdm: kdm
3302 +livecd/xsession: kde
3303 livecd/rcadd:
3304 hald|default
3305 dbus|default