Advertisement
Guest User

kernel-config diff

a guest
May 17th, 2012
146
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 24.14 KB | None | 0 0
  1. --- linux-3.1.1-gentoo/.config 2011-12-20 02:40:42.000000000 +0100
  2. +++ linux-3.3.5-gentoo/.config 2012-05-13 14:39:41.000000000 +0200
  3. @@ -1,6 +1,6 @@
  4. #
  5. # Automatically generated file; DO NOT EDIT.
  6. -# Linux/x86_64 3.1.1-gentoo Kernel Configuration
  7. +# Linux/x86_64 3.3.5-gentoo Kernel Configuration
  8. #
  9. CONFIG_64BIT=y
  10. # CONFIG_X86_32 is not set
  11. @@ -18,11 +18,9 @@
  12. CONFIG_STACKTRACE_SUPPORT=y
  13. CONFIG_HAVE_LATENCYTOP_SUPPORT=y
  14. CONFIG_MMU=y
  15. -CONFIG_ZONE_DMA=y
  16. CONFIG_NEED_DMA_MAP_STATE=y
  17. CONFIG_NEED_SG_DMA_LENGTH=y
  18. CONFIG_GENERIC_ISA_DMA=y
  19. -CONFIG_GENERIC_IOMAP=y
  20. CONFIG_GENERIC_BUG=y
  21. CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
  22. CONFIG_GENERIC_HWEIGHT=y
  23. @@ -38,15 +36,12 @@
  24. CONFIG_HAVE_SETUP_PER_CPU_AREA=y
  25. CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
  26. CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
  27. -CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
  28. CONFIG_ARCH_HIBERNATION_POSSIBLE=y
  29. CONFIG_ARCH_SUSPEND_POSSIBLE=y
  30. CONFIG_ZONE_DMA32=y
  31. -CONFIG_ARCH_POPULATES_NODE_MAP=y
  32. CONFIG_AUDIT_ARCH=y
  33. CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
  34. CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
  35. -CONFIG_HAVE_INTEL_TXT=y
  36. CONFIG_X86_64_SMP=y
  37. CONFIG_X86_HT=y
  38. CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
  39. @@ -99,7 +94,7 @@
  40. CONFIG_GENERIC_IRQ_SHOW=y
  41. CONFIG_GENERIC_PENDING_IRQ=y
  42. CONFIG_IRQ_FORCED_THREADING=y
  43. -# CONFIG_SPARSE_IRQ is not set
  44. +CONFIG_SPARSE_IRQ=y
  45.  
  46. #
  47. # RCU Subsystem
  48. @@ -126,9 +121,11 @@
  49. # CONFIG_CGROUP_PERF is not set
  50. CONFIG_CGROUP_SCHED=y
  51. CONFIG_FAIR_GROUP_SCHED=y
  52. +CONFIG_CFS_BANDWIDTH=y
  53. # CONFIG_RT_GROUP_SCHED is not set
  54. CONFIG_BLK_CGROUP=y
  55. # CONFIG_DEBUG_BLK_CGROUP is not set
  56. +# CONFIG_CHECKPOINT_RESTORE is not set
  57. CONFIG_NAMESPACES=y
  58. CONFIG_UTS_NS=y
  59. CONFIG_IPC_NS=y
  60. @@ -150,7 +147,7 @@
  61. CONFIG_ANON_INODES=y
  62. # CONFIG_EXPERT is not set
  63. CONFIG_UID16=y
  64. -CONFIG_SYSCTL_SYSCALL=y
  65. +# CONFIG_SYSCTL_SYSCALL is not set
  66. CONFIG_KALLSYMS=y
  67. CONFIG_HOTPLUG=y
  68. CONFIG_PRINTK=y
  69. @@ -182,6 +179,7 @@
  70. CONFIG_SLUB=y
  71. # CONFIG_PROFILING is not set
  72. CONFIG_HAVE_OPROFILE=y
  73. +CONFIG_OPROFILE_NMI_TIMER=y
  74. # CONFIG_KPROBES is not set
  75. CONFIG_JUMP_LABEL=y
  76. CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
  77. @@ -200,6 +198,9 @@
  78. CONFIG_HAVE_PERF_EVENTS_NMI=y
  79. CONFIG_HAVE_ARCH_JUMP_LABEL=y
  80. CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
  81. +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
  82. +CONFIG_HAVE_CMPXCHG_LOCAL=y
  83. +CONFIG_HAVE_CMPXCHG_DOUBLE=y
  84.  
  85. #
  86. # GCOV-based kernel profiling
  87. @@ -220,6 +221,28 @@
  88. # CONFIG_BLK_DEV_BSGLIB is not set
  89. # CONFIG_BLK_DEV_INTEGRITY is not set
  90. # CONFIG_BLK_DEV_THROTTLING is not set
  91. +
  92. +#
  93. +# Partition Types
  94. +#
  95. +CONFIG_PARTITION_ADVANCED=y
  96. +# CONFIG_ACORN_PARTITION is not set
  97. +# CONFIG_OSF_PARTITION is not set
  98. +# CONFIG_AMIGA_PARTITION is not set
  99. +# CONFIG_ATARI_PARTITION is not set
  100. +# CONFIG_MAC_PARTITION is not set
  101. +CONFIG_MSDOS_PARTITION=y
  102. +# CONFIG_BSD_DISKLABEL is not set
  103. +# CONFIG_MINIX_SUBPARTITION is not set
  104. +# CONFIG_SOLARIS_X86_PARTITION is not set
  105. +# CONFIG_UNIXWARE_DISKLABEL is not set
  106. +# CONFIG_LDM_PARTITION is not set
  107. +# CONFIG_SGI_PARTITION is not set
  108. +# CONFIG_ULTRIX_PARTITION is not set
  109. +# CONFIG_SUN_PARTITION is not set
  110. +# CONFIG_KARMA_PARTITION is not set
  111. +# CONFIG_EFI_PARTITION is not set
  112. +# CONFIG_SYSV68_PARTITION is not set
  113. CONFIG_BLOCK_COMPAT=y
  114.  
  115. #
  116. @@ -266,10 +289,12 @@
  117. #
  118. # Processor type and features
  119. #
  120. +CONFIG_ZONE_DMA=y
  121. CONFIG_TICK_ONESHOT=y
  122. CONFIG_NO_HZ=y
  123. CONFIG_HIGH_RES_TIMERS=y
  124. CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  125. +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
  126. CONFIG_SMP=y
  127. CONFIG_X86_MPPARSE=y
  128. # CONFIG_X86_EXTENDED_PLATFORM is not set
  129. @@ -285,8 +310,6 @@
  130. # CONFIG_GENERIC_CPU is not set
  131. CONFIG_X86_INTERNODE_CACHE_SHIFT=7
  132. CONFIG_X86_CMPXCHG=y
  133. -CONFIG_CMPXCHG_LOCAL=y
  134. -CONFIG_CMPXCHG_DOUBLE=y
  135. CONFIG_X86_L1_CACHE_SHIFT=6
  136. CONFIG_X86_XADD=y
  137. CONFIG_X86_WP_WORKS_OK=y
  138. @@ -355,6 +378,8 @@
  139. CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
  140. CONFIG_SPARSEMEM_VMEMMAP=y
  141. CONFIG_HAVE_MEMBLOCK=y
  142. +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
  143. +CONFIG_ARCH_DISCARD_MEMBLOCK=y
  144. # CONFIG_MEMORY_HOTPLUG is not set
  145. CONFIG_PAGEFLAGS_EXTENDED=y
  146. CONFIG_SPLIT_PTLOCK_CPUS=4
  147. @@ -381,6 +406,7 @@
  148. CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
  149. CONFIG_X86_PAT=y
  150. CONFIG_ARCH_USES_PG_UNCACHED=y
  151. +CONFIG_ARCH_RANDOM=y
  152. # CONFIG_EFI is not set
  153. CONFIG_SECCOMP=y
  154. # CONFIG_CC_STACKPROTECTOR is not set
  155. @@ -495,6 +521,8 @@
  156. # CONFIG_PCI_STUB is not set
  157. CONFIG_HT_IRQ=y
  158. # CONFIG_PCI_IOV is not set
  159. +# CONFIG_PCI_PRI is not set
  160. +# CONFIG_PCI_PASID is not set
  161. CONFIG_PCI_IOAPIC=y
  162. CONFIG_PCI_LABEL=y
  163. CONFIG_ISA_DMA_API=y
  164. @@ -508,6 +536,7 @@
  165. #
  166. CONFIG_BINFMT_ELF=y
  167. CONFIG_COMPAT_BINFMT_ELF=y
  168. +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
  169. CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
  170. # CONFIG_HAVE_AOUT is not set
  171. CONFIG_BINFMT_MISC=y
  172. @@ -525,6 +554,7 @@
  173. #
  174. CONFIG_PACKET=y
  175. CONFIG_UNIX=y
  176. +# CONFIG_UNIX_DIAG is not set
  177. CONFIG_XFRM=y
  178. CONFIG_XFRM_USER=y
  179. # CONFIG_XFRM_SUB_POLICY is not set
  180. @@ -611,8 +641,10 @@
  181. CONFIG_NETFILTER_NETLINK_LOG=y
  182. CONFIG_NF_CONNTRACK=y
  183. CONFIG_NF_CONNTRACK_SECMARK=y
  184. +CONFIG_NF_CONNTRACK_PROCFS=y
  185. CONFIG_NF_CONNTRACK_FTP=y
  186. CONFIG_NF_CONNTRACK_IRC=y
  187. +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
  188. CONFIG_NF_CONNTRACK_SIP=y
  189. CONFIG_NF_CT_NETLINK=y
  190. CONFIG_NETFILTER_XTABLES=y
  191. @@ -661,6 +693,7 @@
  192. # CONFIG_NF_NAT_H323 is not set
  193. CONFIG_NF_NAT_SIP=y
  194. CONFIG_IP_NF_MANGLE=y
  195. +# CONFIG_IP_NF_RAW is not set
  196.  
  197. #
  198. # IPv6: Netfilter Configuration
  199. @@ -673,6 +706,7 @@
  200. CONFIG_IP6_NF_FILTER=y
  201. CONFIG_IP6_NF_TARGET_REJECT=y
  202. CONFIG_IP6_NF_MANGLE=y
  203. +# CONFIG_IP6_NF_RAW is not set
  204. # CONFIG_IP_DCCP is not set
  205. # CONFIG_IP_SCTP is not set
  206. # CONFIG_RDS is not set
  207. @@ -750,9 +784,12 @@
  208. # CONFIG_DCB is not set
  209. CONFIG_DNS_RESOLVER=y
  210. # CONFIG_BATMAN_ADV is not set
  211. +# CONFIG_OPENVSWITCH is not set
  212. CONFIG_RPS=y
  213. CONFIG_RFS_ACCEL=y
  214. CONFIG_XPS=y
  215. +# CONFIG_NETPRIO_CGROUP is not set
  216. +CONFIG_BQL=y
  217. CONFIG_HAVE_BPF_JIT=y
  218. # CONFIG_BPF_JIT is not set
  219.  
  220. @@ -764,8 +801,6 @@
  221. # CONFIG_CAN is not set
  222. # CONFIG_IRDA is not set
  223. CONFIG_BT=m
  224. -CONFIG_BT_L2CAP=y
  225. -CONFIG_BT_SCO=y
  226. CONFIG_BT_RFCOMM=m
  227. # CONFIG_BT_RFCOMM_TTY is not set
  228. # CONFIG_BT_BNEP is not set
  229. @@ -812,6 +847,8 @@
  230. CONFIG_FIRMWARE_IN_KERNEL=y
  231. CONFIG_EXTRA_FIRMWARE=""
  232. # CONFIG_SYS_HYPERVISOR is not set
  233. +# CONFIG_GENERIC_CPU_DEVICES is not set
  234. +# CONFIG_DMA_SHARED_BUFFER is not set
  235. CONFIG_CONNECTOR=y
  236. CONFIG_PROC_EVENTS=y
  237. # CONFIG_MTD is not set
  238. @@ -835,6 +872,7 @@
  239. # CONFIG_BLK_DEV_CRYPTOLOOP is not set
  240. # CONFIG_BLK_DEV_DRBD is not set
  241. # CONFIG_BLK_DEV_NBD is not set
  242. +# CONFIG_BLK_DEV_NVME is not set
  243. # CONFIG_BLK_DEV_SX8 is not set
  244. # CONFIG_BLK_DEV_UB is not set
  245. CONFIG_BLK_DEV_RAM=y
  246. @@ -847,8 +885,11 @@
  247. # CONFIG_ATA_OVER_ETH is not set
  248. # CONFIG_BLK_DEV_HD is not set
  249. # CONFIG_BLK_DEV_RBD is not set
  250. +
  251. +#
  252. +# Misc devices
  253. +#
  254. # CONFIG_SENSORS_LIS3LV02D is not set
  255. -CONFIG_MISC_DEVICES=y
  256. # CONFIG_AD525X_DPOT is not set
  257. # CONFIG_IBM_ASM is not set
  258. # CONFIG_PHANTOM is not set
  259. @@ -890,6 +931,11 @@
  260. # Texas Instruments shared transport line discipline
  261. #
  262. # CONFIG_SENSORS_LIS3_I2C is not set
  263. +
  264. +#
  265. +# Altera FPGA firmware download module
  266. +#
  267. +# CONFIG_ALTERA_STAPL is not set
  268. CONFIG_HAVE_IDE=y
  269. # CONFIG_IDE is not set
  270.  
  271. @@ -1033,6 +1079,7 @@
  272. # CONFIG_DM_DEBUG is not set
  273. CONFIG_DM_CRYPT=y
  274. # CONFIG_DM_SNAPSHOT is not set
  275. +# CONFIG_DM_THIN_PROVISIONING is not set
  276. CONFIG_DM_MIRROR=y
  277. # CONFIG_DM_RAID is not set
  278. # CONFIG_DM_LOG_USERSPACE is not set
  279. @@ -1057,51 +1104,87 @@
  280. # CONFIG_I2O is not set
  281. # CONFIG_MACINTOSH_DRIVERS is not set
  282. CONFIG_NETDEVICES=y
  283. -# CONFIG_IFB is not set
  284. -# CONFIG_DUMMY is not set
  285. +CONFIG_NET_CORE=y
  286. # CONFIG_BONDING is not set
  287. -# CONFIG_MACVLAN is not set
  288. +# CONFIG_DUMMY is not set
  289. # CONFIG_EQUALIZER is not set
  290. +# CONFIG_NET_FC is not set
  291. +CONFIG_MII=y
  292. +# CONFIG_IFB is not set
  293. +# CONFIG_NET_TEAM is not set
  294. +# CONFIG_MACVLAN is not set
  295. +# CONFIG_NETCONSOLE is not set
  296. +# CONFIG_NETPOLL is not set
  297. +# CONFIG_NET_POLL_CONTROLLER is not set
  298. # CONFIG_TUN is not set
  299. # CONFIG_VETH is not set
  300. -# CONFIG_NET_SB1000 is not set
  301. # CONFIG_ARCNET is not set
  302. -CONFIG_MII=y
  303. -# CONFIG_PHYLIB is not set
  304. -# CONFIG_NET_ETHERNET is not set
  305. -CONFIG_NETDEV_1000=y
  306. -# CONFIG_ACENIC is not set
  307. -# CONFIG_DL2K is not set
  308. -# CONFIG_E1000 is not set
  309. -# CONFIG_E1000E is not set
  310. -# CONFIG_IP1000 is not set
  311. -# CONFIG_IGB is not set
  312. -# CONFIG_IGBVF is not set
  313. -# CONFIG_NS83820 is not set
  314. -# CONFIG_HAMACHI is not set
  315. -# CONFIG_YELLOWFIN is not set
  316. -CONFIG_R8169=y
  317. -# CONFIG_SIS190 is not set
  318. -# CONFIG_SKGE is not set
  319. -# CONFIG_SKY2 is not set
  320. -# CONFIG_VIA_VELOCITY is not set
  321. -# CONFIG_TIGON3 is not set
  322. -# CONFIG_BNX2 is not set
  323. -# CONFIG_CNIC is not set
  324. -# CONFIG_QLA3XXX is not set
  325. -# CONFIG_ATL1 is not set
  326. -# CONFIG_ATL1E is not set
  327. -# CONFIG_ATL1C is not set
  328. -# CONFIG_JME is not set
  329. -# CONFIG_STMMAC_ETH is not set
  330. -# CONFIG_PCH_GBE is not set
  331. -# CONFIG_NETDEV_10000 is not set
  332. -# CONFIG_TR is not set
  333. -# CONFIG_WLAN is not set
  334.  
  335. #
  336. -# Enable WiMAX (Networking options) to see the WiMAX drivers
  337. +# CAIF transport drivers
  338. #
  339. +CONFIG_ETHERNET=y
  340. +# CONFIG_NET_VENDOR_3COM is not set
  341. +# CONFIG_NET_VENDOR_ADAPTEC is not set
  342. +# CONFIG_NET_VENDOR_ALTEON is not set
  343. +# CONFIG_NET_VENDOR_AMD is not set
  344. +# CONFIG_NET_VENDOR_ATHEROS is not set
  345. +# CONFIG_NET_VENDOR_BROADCOM is not set
  346. +# CONFIG_NET_VENDOR_BROCADE is not set
  347. +# CONFIG_NET_CALXEDA_XGMAC is not set
  348. +# CONFIG_NET_VENDOR_CHELSIO is not set
  349. +# CONFIG_NET_VENDOR_CISCO is not set
  350. +# CONFIG_DNET is not set
  351. +# CONFIG_NET_VENDOR_DEC is not set
  352. +# CONFIG_NET_VENDOR_DLINK is not set
  353. +# CONFIG_NET_VENDOR_EMULEX is not set
  354. +# CONFIG_NET_VENDOR_EXAR is not set
  355. +# CONFIG_NET_VENDOR_HP is not set
  356. +# CONFIG_NET_VENDOR_INTEL is not set
  357. +# CONFIG_IP1000 is not set
  358. +# CONFIG_JME is not set
  359. +# CONFIG_NET_VENDOR_MARVELL is not set
  360. +# CONFIG_NET_VENDOR_MELLANOX is not set
  361. +# CONFIG_NET_VENDOR_MICREL is not set
  362. +# CONFIG_NET_VENDOR_MYRI is not set
  363. +# CONFIG_FEALNX is not set
  364. +# CONFIG_NET_VENDOR_NATSEMI is not set
  365. +# CONFIG_NET_VENDOR_NVIDIA is not set
  366. +# CONFIG_NET_VENDOR_OKI is not set
  367. +# CONFIG_ETHOC is not set
  368. +# CONFIG_NET_PACKET_ENGINE is not set
  369. +# CONFIG_NET_VENDOR_QLOGIC is not set
  370. +CONFIG_NET_VENDOR_REALTEK=y
  371. +# CONFIG_8139CP is not set
  372. +# CONFIG_8139TOO is not set
  373. +CONFIG_R8169=y
  374. +# CONFIG_NET_VENDOR_RDC is not set
  375. +# CONFIG_NET_VENDOR_SEEQ is not set
  376. +# CONFIG_NET_VENDOR_SILAN is not set
  377. +# CONFIG_NET_VENDOR_SIS is not set
  378. +# CONFIG_SFC is not set
  379. +# CONFIG_NET_VENDOR_SMSC is not set
  380. +# CONFIG_NET_VENDOR_STMICRO is not set
  381. +# CONFIG_NET_VENDOR_SUN is not set
  382. +# CONFIG_NET_VENDOR_TEHUTI is not set
  383. +# CONFIG_NET_VENDOR_TI is not set
  384. +# CONFIG_NET_VENDOR_VIA is not set
  385. +# CONFIG_FDDI is not set
  386. +# CONFIG_HIPPI is not set
  387. +# CONFIG_NET_SB1000 is not set
  388. +# CONFIG_PHYLIB is not set
  389. +CONFIG_PPP=y
  390. +CONFIG_PPP_BSDCOMP=y
  391. +CONFIG_PPP_DEFLATE=y
  392. +# CONFIG_PPP_FILTER is not set
  393. +CONFIG_PPP_MPPE=y
  394. +# CONFIG_PPP_MULTILINK is not set
  395. +# CONFIG_PPPOE is not set
  396. +CONFIG_PPP_ASYNC=y
  397. +CONFIG_PPP_SYNC_TTY=y
  398. +# CONFIG_SLIP is not set
  399. +CONFIG_SLHC=y
  400. +# CONFIG_TR is not set
  401.  
  402. #
  403. # USB Network Adapters
  404. @@ -1112,28 +1195,12 @@
  405. # CONFIG_USB_RTL8150 is not set
  406. # CONFIG_USB_USBNET is not set
  407. # CONFIG_USB_IPHETH is not set
  408. -# CONFIG_WAN is not set
  409. +# CONFIG_WLAN is not set
  410.  
  411. #
  412. -# CAIF transport drivers
  413. +# Enable WiMAX (Networking options) to see the WiMAX drivers
  414. #
  415. -# CONFIG_FDDI is not set
  416. -# CONFIG_HIPPI is not set
  417. -CONFIG_PPP=y
  418. -# CONFIG_PPP_MULTILINK is not set
  419. -# CONFIG_PPP_FILTER is not set
  420. -CONFIG_PPP_ASYNC=y
  421. -CONFIG_PPP_SYNC_TTY=y
  422. -CONFIG_PPP_DEFLATE=y
  423. -CONFIG_PPP_BSDCOMP=y
  424. -CONFIG_PPP_MPPE=y
  425. -# CONFIG_PPPOE is not set
  426. -# CONFIG_SLIP is not set
  427. -CONFIG_SLHC=y
  428. -# CONFIG_NET_FC is not set
  429. -# CONFIG_NETCONSOLE is not set
  430. -# CONFIG_NETPOLL is not set
  431. -# CONFIG_NET_POLL_CONTROLLER is not set
  432. +# CONFIG_WAN is not set
  433. # CONFIG_VMXNET3 is not set
  434. # CONFIG_ISDN is not set
  435. # CONFIG_PHONE is not set
  436. @@ -1168,6 +1235,8 @@
  437. # CONFIG_KEYBOARD_QT2160 is not set
  438. # CONFIG_KEYBOARD_LKKBD is not set
  439. # CONFIG_KEYBOARD_TCA6416 is not set
  440. +# CONFIG_KEYBOARD_TCA8418 is not set
  441. +# CONFIG_KEYBOARD_LM8323 is not set
  442. # CONFIG_KEYBOARD_MAX7359 is not set
  443. # CONFIG_KEYBOARD_MCS is not set
  444. # CONFIG_KEYBOARD_MPR121 is not set
  445. @@ -1216,11 +1285,12 @@
  446. # CONFIG_INPUT_TOUCHSCREEN is not set
  447. CONFIG_INPUT_MISC=y
  448. # CONFIG_INPUT_AD714X is not set
  449. +# CONFIG_INPUT_BMA150 is not set
  450. # CONFIG_INPUT_PCSPKR is not set
  451. # CONFIG_INPUT_MMA8450 is not set
  452. # CONFIG_INPUT_MPU3050 is not set
  453. +# CONFIG_INPUT_APANEL is not set
  454. # CONFIG_INPUT_ATLAS_BTNS is not set
  455. -# CONFIG_INPUT_ATI_REMOTE is not set
  456. # CONFIG_INPUT_ATI_REMOTE2 is not set
  457. # CONFIG_INPUT_KEYSPAN_REMOTE is not set
  458. # CONFIG_INPUT_KXTJ9 is not set
  459. @@ -1252,6 +1322,7 @@
  460. CONFIG_VT=y
  461. CONFIG_CONSOLE_TRANSLATIONS=y
  462. CONFIG_VT_CONSOLE=y
  463. +CONFIG_VT_CONSOLE_SLEEP=y
  464. CONFIG_HW_CONSOLE=y
  465. CONFIG_VT_HW_CONSOLE_BINDING=y
  466. CONFIG_UNIX98_PTYS=y
  467. @@ -1261,6 +1332,11 @@
  468. # CONFIG_NOZOMI is not set
  469. # CONFIG_N_GSM is not set
  470. # CONFIG_TRACE_SINK is not set
  471. +
  472. +#
  473. +# KCopy
  474. +#
  475. +CONFIG_KCOPY=m
  476. CONFIG_DEVKMEM=y
  477.  
  478. #
  479. @@ -1349,6 +1425,7 @@
  480. #
  481. # I2C system bus drivers (mostly embedded / system-on-chip)
  482. #
  483. +# CONFIG_I2C_DESIGNWARE_PCI is not set
  484. # CONFIG_I2C_INTEL_MID is not set
  485. CONFIG_I2C_OCORES=m
  486. # CONFIG_I2C_PCA_PLATFORM is not set
  487. @@ -1399,11 +1476,12 @@
  488. # CONFIG_TEST_POWER is not set
  489. # CONFIG_BATTERY_DS2780 is not set
  490. # CONFIG_BATTERY_DS2782 is not set
  491. -# CONFIG_BATTERY_BQ20Z75 is not set
  492. +# CONFIG_BATTERY_SBS is not set
  493. # CONFIG_BATTERY_BQ27x00 is not set
  494. # CONFIG_BATTERY_MAX17040 is not set
  495. # CONFIG_BATTERY_MAX17042 is not set
  496. # CONFIG_CHARGER_MAX8903 is not set
  497. +# CONFIG_CHARGER_LP8727 is not set
  498. CONFIG_HWMON=y
  499. CONFIG_HWMON_VID=y
  500. # CONFIG_HWMON_DEBUG_CHIP is not set
  501. @@ -1529,7 +1607,10 @@
  502. # Broadcom specific AMBA
  503. #
  504. # CONFIG_BCMA is not set
  505. -CONFIG_MFD_SUPPORT=y
  506. +
  507. +#
  508. +# Multifunction device drivers
  509. +#
  510. CONFIG_MFD_CORE=y
  511. # CONFIG_MFD_88PM860X is not set
  512. # CONFIG_MFD_SM501 is not set
  513. @@ -1541,10 +1622,12 @@
  514. # CONFIG_MFD_TC3589X is not set
  515. # CONFIG_MFD_TMIO is not set
  516. # CONFIG_PMIC_DA903X is not set
  517. +# CONFIG_MFD_DA9052_I2C is not set
  518. # CONFIG_PMIC_ADP5520 is not set
  519. # CONFIG_MFD_MAX8925 is not set
  520. # CONFIG_MFD_MAX8997 is not set
  521. # CONFIG_MFD_MAX8998 is not set
  522. +# CONFIG_MFD_S5M_CORE is not set
  523. # CONFIG_MFD_WM8400 is not set
  524. # CONFIG_MFD_WM831X_I2C is not set
  525. # CONFIG_MFD_WM8350_I2C is not set
  526. @@ -1581,8 +1664,10 @@
  527. CONFIG_IR_JVC_DECODER=y
  528. CONFIG_IR_SONY_DECODER=y
  529. CONFIG_IR_RC5_SZ_DECODER=y
  530. -CONFIG_IR_MCE_KBD_DECODER=y
  531. +CONFIG_IR_SANYO_DECODER=y
  532. +# CONFIG_IR_MCE_KBD_DECODER is not set
  533. CONFIG_IR_LIRC_CODEC=y
  534. +# CONFIG_RC_ATI_REMOTE is not set
  535. # CONFIG_IR_ENE is not set
  536. # CONFIG_IR_IMON is not set
  537. # CONFIG_IR_MCEUSB is not set
  538. @@ -1666,24 +1751,23 @@
  539. # Miscelaneous helper chips
  540. #
  541. # CONFIG_VIDEO_VIVI is not set
  542. +# CONFIG_V4L_USB_DRIVERS is not set
  543. +CONFIG_V4L_PCI_DRIVERS=y
  544. CONFIG_VIDEO_BT848=y
  545. -# CONFIG_VIDEO_CPIA2 is not set
  546. -# CONFIG_VIDEO_ZORAN is not set
  547. -# CONFIG_VIDEO_SAA7134 is not set
  548. -# CONFIG_VIDEO_MXB is not set
  549. -# CONFIG_VIDEO_HEXIUM_ORION is not set
  550. -# CONFIG_VIDEO_HEXIUM_GEMINI is not set
  551. -# CONFIG_VIDEO_TIMBERDALE is not set
  552. CONFIG_VIDEO_CX88=y
  553. CONFIG_VIDEO_CX88_ALSA=y
  554. CONFIG_VIDEO_CX88_BLACKBIRD=y
  555. CONFIG_VIDEO_CX88_MPEG=y
  556. +# CONFIG_VIDEO_HEXIUM_GEMINI is not set
  557. +# CONFIG_VIDEO_HEXIUM_ORION is not set
  558. # CONFIG_VIDEO_IVTV is not set
  559. +# CONFIG_VIDEO_MXB is not set
  560. +# CONFIG_VIDEO_SAA7134 is not set
  561. +# CONFIG_VIDEO_ZORAN is not set
  562. +CONFIG_V4L_PLATFORM_DRIVERS=y
  563. # CONFIG_VIDEO_CAFE_CCIC is not set
  564. -# CONFIG_VIDEO_SR030PC30 is not set
  565. -# CONFIG_VIDEO_NOON010PC30 is not set
  566. +# CONFIG_VIDEO_TIMBERDALE is not set
  567. # CONFIG_SOC_CAMERA is not set
  568. -# CONFIG_V4L_USB_DRIVERS is not set
  569. # CONFIG_V4L_MEM2MEM_DRIVERS is not set
  570. # CONFIG_RADIO_ADAPTERS is not set
  571.  
  572. @@ -1708,6 +1792,8 @@
  573. # CONFIG_DRM_SIS is not set
  574. # CONFIG_DRM_VIA is not set
  575. # CONFIG_DRM_SAVAGE is not set
  576. +# CONFIG_DRM_VMWGFX is not set
  577. +# CONFIG_DRM_GMA500 is not set
  578. # CONFIG_STUB_POULSBO is not set
  579. # CONFIG_VGASTATE is not set
  580. CONFIG_VIDEO_OUTPUT_CONTROL=y
  581. @@ -1768,6 +1854,7 @@
  582. # CONFIG_FB_CARMINE is not set
  583. # CONFIG_FB_GEODE is not set
  584. # CONFIG_FB_TMIO is not set
  585. +# CONFIG_FB_SMSCUFX is not set
  586. # CONFIG_FB_UDL is not set
  587. # CONFIG_FB_VIRTUAL is not set
  588. # CONFIG_FB_METRONOME is not set
  589. @@ -1776,15 +1863,6 @@
  590. # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  591.  
  592. #
  593. -# Display device support
  594. -#
  595. -CONFIG_DISPLAY_SUPPORT=y
  596. -
  597. -#
  598. -# Display hardware drivers
  599. -#
  600. -
  601. -#
  602. # Console display driver support
  603. #
  604. CONFIG_VGA_CONSOLE=y
  605. @@ -1821,6 +1899,7 @@
  606. # CONFIG_SND_VERBOSE_PRINTK is not set
  607. # CONFIG_SND_DEBUG is not set
  608. CONFIG_SND_VMASTER=y
  609. +CONFIG_SND_KCTL_JACK=y
  610. CONFIG_SND_DMA_SGBUF=y
  611. CONFIG_SND_RAWMIDI_SEQ=m
  612. # CONFIG_SND_OPL3_LIB_SEQ is not set
  613. @@ -1894,7 +1973,7 @@
  614. CONFIG_SND_HDA_CODEC_CIRRUS=y
  615. CONFIG_SND_HDA_CODEC_CONEXANT=y
  616. CONFIG_SND_HDA_CODEC_CA0110=y
  617. -CONFIG_SND_HDA_CODEC_CA0132=y
  618. +# CONFIG_SND_HDA_CODEC_CA0132 is not set
  619. CONFIG_SND_HDA_CODEC_CMEDIA=y
  620. CONFIG_SND_HDA_CODEC_SI3054=y
  621. CONFIG_SND_HDA_GENERIC=y
  622. @@ -1928,6 +2007,7 @@
  623. # CONFIG_SOUND_PRIME is not set
  624. CONFIG_HID_SUPPORT=y
  625. CONFIG_HID=y
  626. +CONFIG_HID_BATTERY_STRENGTH=y
  627. CONFIG_HIDRAW=y
  628.  
  629. #
  630. @@ -1962,10 +2042,11 @@
  631. CONFIG_HID_KENSINGTON=y
  632. # CONFIG_HID_LCPOWER is not set
  633. CONFIG_HID_LOGITECH=y
  634. +CONFIG_HID_LOGITECH_DJ=y
  635. # CONFIG_LOGITECH_FF is not set
  636. # CONFIG_LOGIRUMBLEPAD2_FF is not set
  637. # CONFIG_LOGIG940_FF is not set
  638. -# CONFIG_LOGIWII_FF is not set
  639. +# CONFIG_LOGIWHEELS_FF is not set
  640. # CONFIG_HID_MAGICMOUSE is not set
  641. CONFIG_HID_MICROSOFT=y
  642. CONFIG_HID_MONTEREY=y
  643. @@ -1975,7 +2056,7 @@
  644. # CONFIG_HID_PANTHERLORD is not set
  645. # CONFIG_HID_PETALYNX is not set
  646. # CONFIG_HID_PICOLCD is not set
  647. -# CONFIG_HID_QUANTA is not set
  648. +# CONFIG_HID_PRIMAX is not set
  649. # CONFIG_HID_ROCCAT is not set
  650. # CONFIG_HID_SAMSUNG is not set
  651. # CONFIG_HID_SONY is not set
  652. @@ -1986,12 +2067,15 @@
  653. # CONFIG_HID_TOPSEED is not set
  654. # CONFIG_HID_THRUSTMASTER is not set
  655. # CONFIG_HID_WACOM is not set
  656. +# CONFIG_HID_WIIMOTE is not set
  657. # CONFIG_HID_ZEROPLUS is not set
  658. # CONFIG_HID_ZYDACRON is not set
  659. CONFIG_USB_SUPPORT=y
  660. +CONFIG_USB_COMMON=y
  661. CONFIG_USB_ARCH_HAS_HCD=y
  662. CONFIG_USB_ARCH_HAS_OHCI=y
  663. CONFIG_USB_ARCH_HAS_EHCI=y
  664. +CONFIG_USB_ARCH_HAS_XHCI=y
  665. CONFIG_USB=y
  666. CONFIG_USB_DEBUG=y
  667. CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  668. @@ -2005,7 +2089,6 @@
  669. CONFIG_USB_SUSPEND=y
  670. # CONFIG_USB_OTG is not set
  671. CONFIG_USB_MON=y
  672. -# CONFIG_USB_WUSB is not set
  673. # CONFIG_USB_WUSB_CBAF is not set
  674.  
  675. #
  676. @@ -2016,6 +2099,7 @@
  677. CONFIG_USB_EHCI_HCD=y
  678. # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
  679. # CONFIG_USB_EHCI_TT_NEWSCHED is not set
  680. +# CONFIG_USB_EHCI_MV is not set
  681. # CONFIG_USB_OXU210HP_HCD is not set
  682. # CONFIG_USB_ISP116X_HCD is not set
  683. # CONFIG_USB_ISP1760_HCD is not set
  684. @@ -2027,8 +2111,6 @@
  685. CONFIG_USB_UHCI_HCD=y
  686. # CONFIG_USB_SL811_HCD is not set
  687. # CONFIG_USB_R8A66597_HCD is not set
  688. -# CONFIG_USB_WHCI_HCD is not set
  689. -# CONFIG_USB_HWA_HCD is not set
  690.  
  691. #
  692. # USB Device Class drivers
  693. @@ -2132,7 +2214,28 @@
  694. # CONFIG_MMC_VUB300 is not set
  695. # CONFIG_MMC_USHC is not set
  696. # CONFIG_MEMSTICK is not set
  697. -# CONFIG_NEW_LEDS is not set
  698. +CONFIG_NEW_LEDS=y
  699. +CONFIG_LEDS_CLASS=y
  700. +
  701. +#
  702. +# LED drivers
  703. +#
  704. +# CONFIG_LEDS_LM3530 is not set
  705. +# CONFIG_LEDS_PCA9532 is not set
  706. +# CONFIG_LEDS_LP3944 is not set
  707. +# CONFIG_LEDS_LP5521 is not set
  708. +# CONFIG_LEDS_LP5523 is not set
  709. +# CONFIG_LEDS_CLEVO_MAIL is not set
  710. +# CONFIG_LEDS_PCA955X is not set
  711. +# CONFIG_LEDS_BD2802 is not set
  712. +# CONFIG_LEDS_INTEL_SS4200 is not set
  713. +# CONFIG_LEDS_TCA6507 is not set
  714. +# CONFIG_LEDS_OT200 is not set
  715. +# CONFIG_LEDS_TRIGGERS is not set
  716. +
  717. +#
  718. +# LED Triggers
  719. +#
  720. # CONFIG_ACCESSIBILITY is not set
  721. # CONFIG_INFINIBAND is not set
  722. # CONFIG_EDAC is not set
  723. @@ -2224,19 +2327,24 @@
  724. #
  725. # CONFIG_VIRTIO_PCI is not set
  726. # CONFIG_VIRTIO_BALLOON is not set
  727. +# CONFIG_VIRTIO_MMIO is not set
  728. +
  729. +#
  730. +# Microsoft Hyper-V guest support
  731. +#
  732. +# CONFIG_HYPERV is not set
  733. # CONFIG_STAGING is not set
  734. # CONFIG_X86_PLATFORM_DEVICES is not set
  735. +
  736. +#
  737. +# Hardware Spinlock drivers
  738. +#
  739. CONFIG_CLKEVT_I8253=y
  740. CONFIG_I8253_LOCK=y
  741. CONFIG_CLKBLD_I8253=y
  742. -CONFIG_IOMMU_API=y
  743. -CONFIG_IOMMU_SUPPORT=y
  744. -# CONFIG_AMD_IOMMU is not set
  745. -CONFIG_DMAR=y
  746. -# CONFIG_DMAR_DEFAULT_ON is not set
  747. -CONFIG_DMAR_FLOPPY_WA=y
  748. -# CONFIG_INTR_REMAP is not set
  749. +# CONFIG_IOMMU_SUPPORT is not set
  750. # CONFIG_VIRT_DRIVERS is not set
  751. +# CONFIG_PM_DEVFREQ is not set
  752.  
  753. #
  754. # Firmware Drivers
  755. @@ -2248,7 +2356,6 @@
  756. CONFIG_DMIID=y
  757. # CONFIG_DMI_SYSFS is not set
  758. # CONFIG_ISCSI_IBFT_FIND is not set
  759. -# CONFIG_SIGMA is not set
  760. # CONFIG_GOOGLE_FIRMWARE is not set
  761.  
  762. #
  763. @@ -2318,9 +2425,7 @@
  764. CONFIG_VFAT_FS=y
  765. CONFIG_FAT_DEFAULT_CODEPAGE=437
  766. CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
  767. -CONFIG_NTFS_FS=m
  768. -# CONFIG_NTFS_DEBUG is not set
  769. -# CONFIG_NTFS_RW is not set
  770. +# CONFIG_NTFS_FS is not set
  771.  
  772. #
  773. # Pseudo filesystems
  774. @@ -2352,6 +2457,7 @@
  775. CONFIG_SQUASHFS_ZLIB=y
  776. # CONFIG_SQUASHFS_LZO is not set
  777. CONFIG_SQUASHFS_XZ=y
  778. +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
  779. # CONFIG_SQUASHFS_EMBEDDED is not set
  780. CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
  781. # CONFIG_VXFS_FS is not set
  782. @@ -2394,28 +2500,6 @@
  783. # CONFIG_NCP_FS is not set
  784. # CONFIG_CODA_FS is not set
  785. # CONFIG_AFS_FS is not set
  786. -
  787. -#
  788. -# Partition Types
  789. -#
  790. -CONFIG_PARTITION_ADVANCED=y
  791. -# CONFIG_ACORN_PARTITION is not set
  792. -# CONFIG_OSF_PARTITION is not set
  793. -# CONFIG_AMIGA_PARTITION is not set
  794. -# CONFIG_ATARI_PARTITION is not set
  795. -# CONFIG_MAC_PARTITION is not set
  796. -CONFIG_MSDOS_PARTITION=y
  797. -# CONFIG_BSD_DISKLABEL is not set
  798. -# CONFIG_MINIX_SUBPARTITION is not set
  799. -# CONFIG_SOLARIS_X86_PARTITION is not set
  800. -# CONFIG_UNIXWARE_DISKLABEL is not set
  801. -# CONFIG_LDM_PARTITION is not set
  802. -# CONFIG_SGI_PARTITION is not set
  803. -# CONFIG_ULTRIX_PARTITION is not set
  804. -# CONFIG_SUN_PARTITION is not set
  805. -# CONFIG_KARMA_PARTITION is not set
  806. -# CONFIG_EFI_PARTITION is not set
  807. -# CONFIG_SYSV68_PARTITION is not set
  808. CONFIG_NLS=y
  809. CONFIG_NLS_DEFAULT="utf8"
  810. CONFIG_NLS_CODEPAGE_437=y
  811. @@ -2524,6 +2608,7 @@
  812. # Security options
  813. #
  814. CONFIG_KEYS=y
  815. +# CONFIG_ENCRYPTED_KEYS is not set
  816. CONFIG_KEYS_DEBUG_PROC_KEYS=y
  817. # CONFIG_SECURITY_DMESG_RESTRICT is not set
  818. CONFIG_SECURITY=y
  819. @@ -2531,11 +2616,11 @@
  820. CONFIG_SECURITY_NETWORK=y
  821. # CONFIG_SECURITY_NETWORK_XFRM is not set
  822. # CONFIG_SECURITY_PATH is not set
  823. -# CONFIG_INTEL_TXT is not set
  824. # CONFIG_SECURITY_SMACK is not set
  825. # CONFIG_SECURITY_TOMOYO is not set
  826. # CONFIG_SECURITY_APPARMOR is not set
  827. # CONFIG_IMA is not set
  828. +# CONFIG_EVM is not set
  829. CONFIG_DEFAULT_SECURITY_DAC=y
  830. CONFIG_DEFAULT_SECURITY=""
  831. CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
  832. @@ -2558,6 +2643,7 @@
  833. CONFIG_CRYPTO_PCOMP2=y
  834. CONFIG_CRYPTO_MANAGER=y
  835. CONFIG_CRYPTO_MANAGER2=y
  836. +# CONFIG_CRYPTO_USER is not set
  837. CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
  838. CONFIG_CRYPTO_GF128MUL=y
  839. CONFIG_CRYPTO_NULL=y
  840. @@ -2606,6 +2692,7 @@
  841. # CONFIG_CRYPTO_RMD256 is not set
  842. # CONFIG_CRYPTO_RMD320 is not set
  843. CONFIG_CRYPTO_SHA1=y
  844. +CONFIG_CRYPTO_SHA1_SSSE3=y
  845. CONFIG_CRYPTO_SHA256=y
  846. CONFIG_CRYPTO_SHA512=y
  847. # CONFIG_CRYPTO_TGR192 is not set
  848. @@ -2621,6 +2708,8 @@
  849. # CONFIG_CRYPTO_ANUBIS is not set
  850. CONFIG_CRYPTO_ARC4=y
  851. CONFIG_CRYPTO_BLOWFISH=y
  852. +CONFIG_CRYPTO_BLOWFISH_COMMON=y
  853. +CONFIG_CRYPTO_BLOWFISH_X86_64=y
  854. # CONFIG_CRYPTO_CAMELLIA is not set
  855. # CONFIG_CRYPTO_CAST5 is not set
  856. # CONFIG_CRYPTO_CAST6 is not set
  857. @@ -2631,10 +2720,12 @@
  858. # CONFIG_CRYPTO_SALSA20_X86_64 is not set
  859. # CONFIG_CRYPTO_SEED is not set
  860. CONFIG_CRYPTO_SERPENT=y
  861. +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
  862. # CONFIG_CRYPTO_TEA is not set
  863. # CONFIG_CRYPTO_TWOFISH is not set
  864. CONFIG_CRYPTO_TWOFISH_COMMON=y
  865. CONFIG_CRYPTO_TWOFISH_X86_64=y
  866. +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=y
  867.  
  868. #
  869. # Compression
  870. @@ -2660,6 +2751,8 @@
  871. #
  872. CONFIG_BITREVERSE=y
  873. CONFIG_GENERIC_FIND_FIRST_BIT=y
  874. +CONFIG_GENERIC_PCI_IOMAP=y
  875. +CONFIG_GENERIC_IOMAP=y
  876. CONFIG_CRC_CCITT=y
  877. CONFIG_CRC16=y
  878. CONFIG_CRC_T10DIF=y
  879. @@ -2691,6 +2784,7 @@
  880. CONFIG_HAS_DMA=y
  881. CONFIG_CHECK_SIGNATURE=y
  882. CONFIG_CPU_RMAP=y
  883. +CONFIG_DQL=y
  884. CONFIG_NLATTR=y
  885. # CONFIG_AVERAGE is not set
  886. # CONFIG_CORDIC is not set
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement