Guest User

Untitled

a guest
Sep 1st, 2012
195
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- config.x86_64.orig 2012-08-23 18:12:36.000000000 +1000
  2. +++ config.x86_64 2012-09-01 16:40:43.590351399 +1000
  3. @@ -1,6 +1,6 @@
  4. #
  5. # Automatically generated file; DO NOT EDIT.
  6. -# Linux/x86_64 3.5.0-2 Kernel Configuration
  7. +# Linux/x86_64 3.6.0-rc3 Kernel Configuration
  8. #
  9. CONFIG_64BIT=y
  10. # CONFIG_X86_32 is not set
  11. @@ -136,10 +136,8 @@
  12. CONFIG_PROC_PID_CPUSET=y
  13. CONFIG_CGROUP_CPUACCT=y
  14. CONFIG_RESOURCE_COUNTERS=y
  15. -CONFIG_CGROUP_MEM_RES_CTLR=y
  16. -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
  17. -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
  18. -CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
  19. +# CONFIG_MEMCG is not set
  20. +# CONFIG_CGROUP_HUGETLB is not set
  21. # CONFIG_CGROUP_PERF is not set
  22. CONFIG_CGROUP_SCHED=y
  23. CONFIG_FAIR_GROUP_SCHED=y
  24. @@ -154,7 +152,6 @@
  25. CONFIG_PID_NS=y
  26. CONFIG_NET_NS=y
  27. CONFIG_SCHED_AUTOGROUP=y
  28. -CONFIG_MM_OWNER=y
  29. # CONFIG_SYSFS_DEPRECATED is not set
  30. CONFIG_RELAY=y
  31. CONFIG_BLK_DEV_INITRD=y
  32. @@ -231,6 +228,7 @@
  33. CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
  34. CONFIG_HAVE_CMPXCHG_LOCAL=y
  35. CONFIG_HAVE_CMPXCHG_DOUBLE=y
  36. +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
  37. CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
  38. CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
  39. CONFIG_SECCOMP_FILTER=y
  40. @@ -429,6 +427,7 @@
  41. CONFIG_HAVE_MEMBLOCK=y
  42. CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
  43. CONFIG_ARCH_DISCARD_MEMBLOCK=y
  44. +CONFIG_MEMORY_ISOLATION=y
  45. CONFIG_MEMORY_HOTPLUG=y
  46. CONFIG_MEMORY_HOTPLUG_SPARSE=y
  47. CONFIG_MEMORY_HOTREMOVE=y
  48. @@ -505,7 +504,7 @@
  49. CONFIG_PM_DEBUG=y
  50. CONFIG_PM_ADVANCED_DEBUG=y
  51. # CONFIG_PM_TEST_SUSPEND is not set
  52. -CONFIG_CAN_PM_TRACE=y
  53. +CONFIG_PM_SLEEP_DEBUG=y
  54. # CONFIG_PM_TRACE_RTC is not set
  55. CONFIG_ACPI=y
  56. CONFIG_ACPI_SLEEP=y
  57. @@ -577,6 +576,7 @@
  58. CONFIG_CPU_IDLE=y
  59. CONFIG_CPU_IDLE_GOV_LADDER=y
  60. CONFIG_CPU_IDLE_GOV_MENU=y
  61. +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
  62. CONFIG_INTEL_IDLE=y
  63.  
  64. #
  65. @@ -712,6 +712,7 @@
  66. CONFIG_IP_PIMSM_V2=y
  67. # CONFIG_ARPD is not set
  68. CONFIG_SYN_COOKIES=y
  69. +CONFIG_NET_IPVTI=m
  70. CONFIG_INET_AH=m
  71. CONFIG_INET_ESP=m
  72. CONFIG_INET_IPCOMP=m
  73. @@ -803,6 +804,8 @@
  74. CONFIG_NF_CONNTRACK_TFTP=m
  75. CONFIG_NF_CT_NETLINK=m
  76. CONFIG_NF_CT_NETLINK_TIMEOUT=m
  77. +CONFIG_NF_CT_NETLINK_HELPER=m
  78. +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
  79. CONFIG_NETFILTER_TPROXY=m
  80. CONFIG_NETFILTER_XTABLES=m
  81.  
  82. @@ -1255,6 +1258,7 @@
  83. CONFIG_BT_HCIUART_BCSP=y
  84. CONFIG_BT_HCIUART_ATH3K=y
  85. CONFIG_BT_HCIUART_LL=y
  86. +# CONFIG_BT_HCIUART_3WIRE is not set
  87. CONFIG_BT_HCIBCM203X=m
  88. CONFIG_BT_HCIBPA10X=m
  89. CONFIG_BT_HCIBFUSB=m
  90. @@ -1285,7 +1289,6 @@
  91. # CONFIG_CFG80211_DEBUGFS is not set
  92. # CONFIG_CFG80211_INTERNAL_REGDB is not set
  93. CONFIG_CFG80211_WEXT=y
  94. -CONFIG_WIRELESS_EXT_SYSFS=y
  95. CONFIG_LIB80211=m
  96. CONFIG_LIB80211_CRYPT_WEP=m
  97. CONFIG_LIB80211_CRYPT_CCMP=m
  98. @@ -1300,6 +1303,7 @@
  99. CONFIG_MAC80211_MESH=y
  100. CONFIG_MAC80211_LEDS=y
  101. # CONFIG_MAC80211_DEBUGFS is not set
  102. +# CONFIG_MAC80211_MESSAGE_TRACING is not set
  103. # CONFIG_MAC80211_DEBUG_MENU is not set
  104. CONFIG_WIMAX=m
  105. CONFIG_WIMAX_DEBUG_LEVEL=8
  106. @@ -1351,6 +1355,7 @@
  107. # CONFIG_GENERIC_CPU_DEVICES is not set
  108. CONFIG_REGMAP=y
  109. CONFIG_REGMAP_I2C=m
  110. +CONFIG_REGMAP_IRQ=y
  111. CONFIG_DMA_SHARED_BUFFER=y
  112. CONFIG_CONNECTOR=y
  113. CONFIG_PROC_EVENTS=y
  114. @@ -1575,9 +1580,6 @@
  115. CONFIG_CB710_CORE=m
  116. # CONFIG_CB710_DEBUG is not set
  117. CONFIG_CB710_DEBUG_ASSUMPTIONS=y
  118. -CONFIG_IWMC3200TOP=m
  119. -# CONFIG_IWMC3200TOP_DEBUG is not set
  120. -# CONFIG_IWMC3200TOP_DEBUGFS is not set
  121.  
  122. #
  123. # Texas Instruments shared transport line discipline
  124. @@ -1619,7 +1621,6 @@
  125. # CONFIG_SCSI_CONSTANTS is not set
  126. # CONFIG_SCSI_LOGGING is not set
  127. # CONFIG_SCSI_SCAN_ASYNC is not set
  128. -CONFIG_SCSI_WAIT_SCAN=m
  129.  
  130. #
  131. # SCSI Transports
  132. @@ -1854,7 +1855,6 @@
  133. CONFIG_DM_SNAPSHOT=m
  134. CONFIG_DM_THIN_PROVISIONING=m
  135. # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
  136. -# CONFIG_DM_DEBUG_SPACE_MAPS is not set
  137. CONFIG_DM_MIRROR=m
  138. CONFIG_DM_RAID=m
  139. CONFIG_DM_LOG_USERSPACE=m
  140. @@ -1914,6 +1914,7 @@
  141. CONFIG_IEEE802154_FAKELB=m
  142. CONFIG_IFB=m
  143. CONFIG_NET_TEAM=m
  144. +CONFIG_NET_TEAM_MODE_BROADCAST=m
  145. CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
  146. CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
  147. CONFIG_NET_TEAM_MODE_LOADBALANCE=m
  148. @@ -2170,6 +2171,7 @@
  149. CONFIG_VITESSE_PHY=m
  150. CONFIG_SMSC_PHY=m
  151. CONFIG_BROADCOM_PHY=m
  152. +CONFIG_BCM87XX_PHY=m
  153. CONFIG_ICPLUS_PHY=m
  154. CONFIG_REALTEK_PHY=m
  155. CONFIG_NATIONAL_PHY=m
  156. @@ -2330,6 +2332,7 @@
  157. CONFIG_LIBIPW=m
  158. # CONFIG_LIBIPW_DEBUG is not set
  159. CONFIG_IWLWIFI=m
  160. +CONFIG_IWLDVM=m
  161.  
  162. #
  163. # Debugging Options
  164. @@ -2347,9 +2350,6 @@
  165. # iwl3945 / iwl4965 Debugging Options
  166. #
  167. # CONFIG_IWLEGACY_DEBUG is not set
  168. -CONFIG_IWM=m
  169. -# CONFIG_IWM_DEBUG is not set
  170. -CONFIG_IWM_TRACING=y
  171. CONFIG_LIBERTAS=m
  172. CONFIG_LIBERTAS_USB=m
  173. CONFIG_LIBERTAS_CS=m
  174. @@ -2378,6 +2378,7 @@
  175. CONFIG_RT2800PCI_RT33XX=y
  176. CONFIG_RT2800PCI_RT35XX=y
  177. CONFIG_RT2800PCI_RT53XX=y
  178. +CONFIG_RT2800PCI_RT3290=y
  179. CONFIG_RT2500USB=m
  180. CONFIG_RT73USB=m
  181. CONFIG_RT2800USB=m
  182. @@ -2404,6 +2405,7 @@
  183. CONFIG_WL1251=m
  184. CONFIG_WL1251_SDIO=m
  185. CONFIG_WL12XX=m
  186. +CONFIG_WL18XX=m
  187. CONFIG_WLCORE=m
  188. CONFIG_WLCORE_SDIO=m
  189. CONFIG_WL12XX_PLATFORM_DATA=y
  190. @@ -2419,8 +2421,6 @@
  191. #
  192. CONFIG_WIMAX_I2400M=m
  193. CONFIG_WIMAX_I2400M_USB=m
  194. -CONFIG_WIMAX_I2400M_SDIO=m
  195. -# CONFIG_WIMAX_IWMC3200_SDIO is not set
  196. CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
  197. # CONFIG_WAN is not set
  198. CONFIG_XEN_NETDEV_FRONTEND=m
  199. @@ -2680,10 +2680,12 @@
  200. CONFIG_TOUCHSCREEN_WACOM_I2C=m
  201. CONFIG_TOUCHSCREEN_MAX11801=m
  202. CONFIG_TOUCHSCREEN_MCS5000=m
  203. +CONFIG_TOUCHSCREEN_MMS114=m
  204. CONFIG_TOUCHSCREEN_MTOUCH=m
  205. CONFIG_TOUCHSCREEN_INEXIO=m
  206. CONFIG_TOUCHSCREEN_MK712=m
  207. CONFIG_TOUCHSCREEN_PENMOUNT=m
  208. +CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  209. CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
  210. CONFIG_TOUCHSCREEN_TOUCHWIN=m
  211. CONFIG_TOUCHSCREEN_UCB1400=m
  212. @@ -2977,6 +2979,7 @@
  213. #
  214. # I2C GPIO expanders:
  215. #
  216. +CONFIG_GPIO_ARIZONA=m
  217. # CONFIG_GPIO_MAX7300 is not set
  218. # CONFIG_GPIO_MAX732X is not set
  219. # CONFIG_GPIO_PCA953X is not set
  220. @@ -2987,6 +2990,7 @@
  221. # PCI GPIO expanders:
  222. #
  223. CONFIG_GPIO_CS5535=m
  224. +CONFIG_GPIO_AMD8111=m
  225. CONFIG_GPIO_LANGWELL=y
  226. # CONFIG_GPIO_PCH is not set
  227. # CONFIG_GPIO_ML_IOH is not set
  228. @@ -3023,6 +3027,7 @@
  229. # CONFIG_CHARGER_LP8727 is not set
  230. # CONFIG_CHARGER_GPIO is not set
  231. # CONFIG_CHARGER_SMB347 is not set
  232. +CONFIG_POWER_AVS=y
  233. CONFIG_HWMON=y
  234. CONFIG_HWMON_VID=m
  235. # CONFIG_HWMON_DEBUG_CHIP is not set
  236. @@ -3061,6 +3066,7 @@
  237. CONFIG_SENSORS_GL518SM=m
  238. CONFIG_SENSORS_GL520SM=m
  239. # CONFIG_SENSORS_GPIO_FAN is not set
  240. +CONFIG_SENSORS_HIH6130=m
  241. CONFIG_SENSORS_CORETEMP=m
  242. CONFIG_SENSORS_IBMAEM=m
  243. CONFIG_SENSORS_IBMPEX=m
  244. @@ -3237,12 +3243,13 @@
  245. CONFIG_BCMA_BLOCKIO=y
  246. CONFIG_BCMA_HOST_PCI_POSSIBLE=y
  247. CONFIG_BCMA_HOST_PCI=y
  248. +CONFIG_BCMA_DRIVER_GMAC_CMN=y
  249. # CONFIG_BCMA_DEBUG is not set
  250.  
  251. #
  252. # Multifunction device drivers
  253. #
  254. -CONFIG_MFD_CORE=m
  255. +CONFIG_MFD_CORE=y
  256. CONFIG_MFD_SM501=m
  257. CONFIG_MFD_SM501_GPIO=y
  258. CONFIG_HTC_PASIC3=m
  259. @@ -3253,6 +3260,10 @@
  260. CONFIG_TPS6507X=m
  261. # CONFIG_MFD_TPS65217 is not set
  262. # CONFIG_MFD_TMIO is not set
  263. +CONFIG_MFD_ARIZONA=y
  264. +CONFIG_MFD_ARIZONA_I2C=m
  265. +# CONFIG_MFD_WM5102 is not set
  266. +# CONFIG_MFD_WM5110 is not set
  267. CONFIG_MFD_PCF50633=m
  268. CONFIG_PCF50633_ADC=m
  269. CONFIG_PCF50633_GPIO=m
  270. @@ -3274,22 +3285,28 @@
  271. #
  272. # Multimedia core support
  273. #
  274. +CONFIG_MEDIA_CAMERA_SUPPORT=y
  275. +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
  276. +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
  277. +CONFIG_MEDIA_RADIO_SUPPORT=y
  278. +CONFIG_MEDIA_RC_SUPPORT=y
  279. CONFIG_MEDIA_CONTROLLER=y
  280. CONFIG_VIDEO_DEV=m
  281. CONFIG_VIDEO_V4L2_COMMON=m
  282. CONFIG_VIDEO_V4L2_SUBDEV_API=y
  283. CONFIG_DVB_CORE=m
  284. CONFIG_DVB_NET=y
  285. -CONFIG_VIDEO_MEDIA=m
  286.  
  287. #
  288. -# Multimedia drivers
  289. +# Media drivers
  290. #
  291. CONFIG_VIDEO_SAA7146=m
  292. CONFIG_VIDEO_SAA7146_VV=m
  293. CONFIG_RC_CORE=m
  294. -CONFIG_LIRC=m
  295. CONFIG_RC_MAP=m
  296. +CONFIG_RC_DECODERS=y
  297. +CONFIG_LIRC=m
  298. +CONFIG_IR_LIRC_CODEC=m
  299. CONFIG_IR_NEC_DECODER=m
  300. CONFIG_IR_RC5_DECODER=m
  301. CONFIG_IR_RC6_DECODER=m
  302. @@ -3298,7 +3315,7 @@
  303. CONFIG_IR_RC5_SZ_DECODER=m
  304. CONFIG_IR_SANYO_DECODER=m
  305. CONFIG_IR_MCE_KBD_DECODER=m
  306. -CONFIG_IR_LIRC_CODEC=m
  307. +CONFIG_RC_DEVICES=y
  308. CONFIG_RC_ATI_REMOTE=m
  309. CONFIG_IR_ENE=m
  310. CONFIG_IR_IMON=m
  311. @@ -3309,6 +3326,7 @@
  312. CONFIG_IR_REDRAT3=m
  313. CONFIG_IR_STREAMZAP=m
  314. CONFIG_IR_WINBOND_CIR=m
  315. +CONFIG_IR_IGUANA=m
  316. CONFIG_RC_LOOPBACK=m
  317. CONFIG_IR_GPIO_CIR=m
  318. CONFIG_MEDIA_ATTACH=y
  319. @@ -3336,6 +3354,8 @@
  320. CONFIG_MEDIA_TUNER_MAX2165=m
  321. CONFIG_MEDIA_TUNER_TDA18218=m
  322. CONFIG_MEDIA_TUNER_FC0011=m
  323. +CONFIG_MEDIA_TUNER_FC0012=m
  324. +CONFIG_MEDIA_TUNER_FC0013=m
  325. CONFIG_MEDIA_TUNER_TDA18212=m
  326. CONFIG_MEDIA_TUNER_TUA9001=m
  327. CONFIG_VIDEO_V4L2=m
  328. @@ -3418,6 +3438,7 @@
  329. CONFIG_VIDEO_ADV7170=m
  330. CONFIG_VIDEO_ADV7175=m
  331. CONFIG_VIDEO_ADV7343=m
  332. +CONFIG_VIDEO_ADV7393=m
  333. CONFIG_VIDEO_AK881X=m
  334.  
  335. #
  336. @@ -3456,7 +3477,10 @@
  337. CONFIG_VIDEO_M52790=m
  338. CONFIG_VIDEO_VIVI=m
  339. CONFIG_V4L_USB_DRIVERS=y
  340. -CONFIG_VIDEO_AU0828=m
  341. +
  342. +#
  343. +# Webcam devices
  344. +#
  345. CONFIG_USB_VIDEO_CLASS=m
  346. CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
  347. CONFIG_USB_GSPCA=m
  348. @@ -3506,15 +3530,32 @@
  349. CONFIG_USB_GSPCA_VICAM=m
  350. CONFIG_USB_GSPCA_XIRLINK_CIT=m
  351. CONFIG_USB_GSPCA_ZC3XX=m
  352. +CONFIG_USB_PWC=m
  353. +# CONFIG_USB_PWC_DEBUG is not set
  354. +CONFIG_USB_PWC_INPUT_EVDEV=y
  355. +CONFIG_VIDEO_CPIA2=m
  356. +CONFIG_USB_ZR364XX=m
  357. +CONFIG_USB_STKWEBCAM=m
  358. +CONFIG_USB_S2255=m
  359. +CONFIG_USB_SN9C102=m
  360. +
  361. +#
  362. +# Webcam and/or TV USB devices
  363. +#
  364. +CONFIG_VIDEO_EM28XX=m
  365. +CONFIG_VIDEO_EM28XX_ALSA=m
  366. +CONFIG_VIDEO_EM28XX_DVB=m
  367. +CONFIG_VIDEO_EM28XX_RC=m
  368. +
  369. +#
  370. +# TV USB devices
  371. +#
  372. +CONFIG_VIDEO_AU0828=m
  373. CONFIG_VIDEO_PVRUSB2=m
  374. CONFIG_VIDEO_PVRUSB2_SYSFS=y
  375. CONFIG_VIDEO_PVRUSB2_DVB=y
  376. # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
  377. CONFIG_VIDEO_HDPVR=m
  378. -CONFIG_VIDEO_EM28XX=m
  379. -CONFIG_VIDEO_EM28XX_ALSA=m
  380. -CONFIG_VIDEO_EM28XX_DVB=m
  381. -CONFIG_VIDEO_EM28XX_RC=m
  382. CONFIG_VIDEO_TLG2300=m
  383. CONFIG_VIDEO_CX231XX=m
  384. CONFIG_VIDEO_CX231XX_RC=y
  385. @@ -3524,14 +3565,6 @@
  386. CONFIG_VIDEO_TM6000_ALSA=m
  387. CONFIG_VIDEO_TM6000_DVB=m
  388. CONFIG_VIDEO_USBVISION=m
  389. -CONFIG_USB_SN9C102=m
  390. -CONFIG_USB_PWC=m
  391. -# CONFIG_USB_PWC_DEBUG is not set
  392. -CONFIG_USB_PWC_INPUT_EVDEV=y
  393. -CONFIG_VIDEO_CPIA2=m
  394. -CONFIG_USB_ZR364XX=m
  395. -CONFIG_USB_STKWEBCAM=m
  396. -CONFIG_USB_S2255=m
  397. CONFIG_V4L_PCI_DRIVERS=y
  398. CONFIG_VIDEO_BT848=m
  399. CONFIG_VIDEO_BT848_DVB=y
  400. @@ -3577,6 +3610,8 @@
  401. CONFIG_USB_MR800=m
  402. CONFIG_USB_DSBR=m
  403. CONFIG_RADIO_MAXIRADIO=m
  404. +CONFIG_RADIO_SHARK=m
  405. +CONFIG_RADIO_SHARK2=m
  406. CONFIG_I2C_SI4713=m
  407. CONFIG_RADIO_SI4713=m
  408. CONFIG_USB_KEENE=m
  409. @@ -3711,7 +3746,6 @@
  410. #
  411. # Supported DVB Frontends
  412. #
  413. -# CONFIG_DVB_FE_CUSTOMISE is not set
  414.  
  415. #
  416. # Multistandard (satellite) frontends
  417. @@ -3778,6 +3812,7 @@
  418. CONFIG_DVB_STV0367=m
  419. CONFIG_DVB_CXD2820R=m
  420. CONFIG_DVB_RTL2830=m
  421. +CONFIG_DVB_RTL2832=m
  422.  
  423. #
  424. # DVB-C (cable) frontends
  425. @@ -4162,6 +4197,7 @@
  426. #
  427. CONFIG_HID=m
  428. CONFIG_HIDRAW=y
  429. +CONFIG_UHID=m
  430. CONFIG_HID_GENERIC=m
  431.  
  432. #
  433. @@ -4192,6 +4228,7 @@
  434. CONFIG_HID_TWINHAN=m
  435. CONFIG_HID_KENSINGTON=m
  436. CONFIG_HID_LCPOWER=m
  437. +CONFIG_HID_LENOVO_TPKBD=m
  438. CONFIG_HID_LOGITECH=m
  439. CONFIG_HID_LOGITECH_DJ=m
  440. CONFIG_LOGITECH_FF=y
  441. @@ -4580,13 +4617,16 @@
  442. CONFIG_LEDS_DELL_NETBOOKS=m
  443. CONFIG_LEDS_MC13783=m
  444. CONFIG_LEDS_TCA6507=m
  445. +CONFIG_LEDS_LM3556=m
  446. CONFIG_LEDS_OT200=m
  447. +CONFIG_LEDS_BLINKM=m
  448. CONFIG_LEDS_TRIGGERS=y
  449.  
  450. #
  451. # LED Triggers
  452. #
  453. CONFIG_LEDS_TRIGGER_TIMER=m
  454. +CONFIG_LEDS_TRIGGER_ONESHOT=m
  455. CONFIG_LEDS_TRIGGER_HEARTBEAT=m
  456. CONFIG_LEDS_TRIGGER_BACKLIGHT=m
  457. CONFIG_LEDS_TRIGGER_GPIO=m
  458. @@ -4604,6 +4644,7 @@
  459. #
  460. # Reporting subsystems
  461. #
  462. +CONFIG_EDAC_LEGACY_SYSFS=y
  463. # CONFIG_EDAC_DEBUG is not set
  464. CONFIG_EDAC_DECODE_MCE=m
  465. CONFIG_EDAC_MCE_INJ=m
  466. @@ -4719,6 +4760,9 @@
  467. CONFIG_UIO_SERCOS3=m
  468. CONFIG_UIO_PCI_GENERIC=m
  469. CONFIG_UIO_NETX=m
  470. +CONFIG_VFIO_IOMMU_TYPE1=m
  471. +CONFIG_VFIO=m
  472. +CONFIG_VFIO_PCI=m
  473. CONFIG_VIRTIO=m
  474. CONFIG_VIRTIO_RING=m
  475.  
  476. @@ -4756,6 +4800,7 @@
  477. CONFIG_XEN_PCIDEV_BACKEND=m
  478. CONFIG_XEN_PRIVCMD=m
  479. CONFIG_XEN_ACPI_PROCESSOR=m
  480. +CONFIG_XEN_MCE_LOG=y
  481. CONFIG_STAGING=y
  482. CONFIG_ET131X=m
  483. CONFIG_SLICOSS=m
  484. @@ -4770,14 +4815,14 @@
  485. # CONFIG_COMEDI_DEBUG is not set
  486. CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
  487. CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
  488. -CONFIG_COMEDI_MISC_DRIVERS=m
  489. +CONFIG_COMEDI_MISC_DRIVERS=y
  490. CONFIG_COMEDI_KCOMEDILIB=m
  491. CONFIG_COMEDI_BOND=m
  492. CONFIG_COMEDI_TEST=m
  493. CONFIG_COMEDI_PARPORT=m
  494. CONFIG_COMEDI_SERIAL2002=m
  495. CONFIG_COMEDI_SKEL=m
  496. -CONFIG_COMEDI_PCI_DRIVERS=m
  497. +CONFIG_COMEDI_PCI_DRIVERS=y
  498. CONFIG_COMEDI_ADDI_APCI_035=m
  499. CONFIG_COMEDI_ADDI_APCI_1032=m
  500. CONFIG_COMEDI_ADDI_APCI_1500=m
  501. @@ -4829,13 +4874,16 @@
  502. CONFIG_COMEDI_NI_65XX=m
  503. CONFIG_COMEDI_NI_660X=m
  504. CONFIG_COMEDI_NI_670X=m
  505. +CONFIG_COMEDI_NI_LABPC=m
  506. CONFIG_COMEDI_NI_PCIDIO=m
  507. CONFIG_COMEDI_NI_PCIMIO=m
  508. CONFIG_COMEDI_RTD520=m
  509. CONFIG_COMEDI_S526=m
  510. CONFIG_COMEDI_S626=m
  511. CONFIG_COMEDI_SSV_DNP=m
  512. -CONFIG_COMEDI_PCMCIA_DRIVERS=m
  513. +CONFIG_COMEDI_MITE=m
  514. +CONFIG_COMEDI_NI_TIOCMD=m
  515. +CONFIG_COMEDI_PCMCIA_DRIVERS=y
  516. CONFIG_COMEDI_CB_DAS16_CS=m
  517. CONFIG_COMEDI_DAS08_CS=m
  518. CONFIG_COMEDI_NI_DAQ_700_CS=m
  519. @@ -4843,22 +4891,19 @@
  520. CONFIG_COMEDI_NI_LABPC_CS=m
  521. CONFIG_COMEDI_NI_MIO_CS=m
  522. CONFIG_COMEDI_QUATECH_DAQP_CS=m
  523. -CONFIG_COMEDI_USB_DRIVERS=m
  524. +CONFIG_COMEDI_USB_DRIVERS=y
  525. CONFIG_COMEDI_DT9812=m
  526. CONFIG_COMEDI_USBDUX=m
  527. CONFIG_COMEDI_USBDUXFAST=m
  528. CONFIG_COMEDI_USBDUXSIGMA=m
  529. CONFIG_COMEDI_VMK80XX=m
  530. -CONFIG_COMEDI_NI_COMMON=m
  531. -CONFIG_COMEDI_MITE=m
  532. -CONFIG_COMEDI_NI_TIO=m
  533. -CONFIG_COMEDI_NI_LABPC=m
  534. CONFIG_COMEDI_8255=m
  535. CONFIG_COMEDI_FC=m
  536. CONFIG_COMEDI_AMPLC_DIO200=m
  537. CONFIG_COMEDI_AMPLC_PC236=m
  538. CONFIG_COMEDI_AMPLC_PC263=m
  539. CONFIG_COMEDI_DAS08=m
  540. +CONFIG_COMEDI_NI_TIO=m
  541. CONFIG_ASUS_OLED=m
  542. # CONFIG_PANEL is not set
  543. CONFIG_R8187SE=m
  544. @@ -4970,6 +5015,7 @@
  545. CONFIG_WIMAX_GDM72XX_USB=y
  546. # CONFIG_WIMAX_GDM72XX_SDIO is not set
  547. CONFIG_WIMAX_GDM72XX_USB_PM=y
  548. +CONFIG_CSR_WIFI=m
  549. CONFIG_X86_PLATFORM_DEVICES=y
  550. CONFIG_ACER_WMI=m
  551. CONFIG_ACERHDF=m
  552. @@ -5049,9 +5095,11 @@
  553. # Extcon Device Drivers
  554. #
  555. CONFIG_EXTCON_GPIO=m
  556. +CONFIG_EXTCON_ARIZONA=m
  557. CONFIG_MEMORY=y
  558. # CONFIG_IIO is not set
  559. # CONFIG_VME_BUS is not set
  560. +# CONFIG_PWM is not set
  561.  
  562. #
  563. # Firmware Drivers
  564. @@ -5223,6 +5271,8 @@
  565. # CONFIG_QNX6FS_FS is not set
  566. # CONFIG_ROMFS_FS is not set
  567. CONFIG_PSTORE=y
  568. +CONFIG_PSTORE_CONSOLE=y
  569. +CONFIG_PSTORE_FTRACE=y
  570. CONFIG_PSTORE_RAM=m
  571. # CONFIG_SYSV_FS is not set
  572. CONFIG_UFS_FS=m
  573. @@ -5233,10 +5283,11 @@
  574. CONFIG_ORE=m
  575. CONFIG_NETWORK_FILESYSTEMS=y
  576. CONFIG_NFS_FS=m
  577. -CONFIG_NFS_V2=y
  578. -CONFIG_NFS_V3=y
  579. +CONFIG_NFS_V2=m
  580. +CONFIG_NFS_V3=m
  581. CONFIG_NFS_V3_ACL=y
  582. -CONFIG_NFS_V4=y
  583. +CONFIG_NFS_V4=m
  584. +# CONFIG_NFS_SWAP is not set
  585. # CONFIG_NFS_V4_1 is not set
  586. CONFIG_NFS_FSCACHE=y
  587. # CONFIG_NFS_USE_LEGACY_DNS is not set
  588. @@ -5413,7 +5464,10 @@
  589. # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
  590. # CONFIG_DEBUG_PER_CPU_MAPS is not set
  591. CONFIG_LKDTM=m
  592. +CONFIG_NOTIFIER_ERROR_INJECTION=m
  593. CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
  594. +CONFIG_PM_NOTIFIER_ERROR_INJECT=m
  595. +CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
  596. # CONFIG_FAULT_INJECTION is not set
  597. # CONFIG_LATENCYTOP is not set
  598. # CONFIG_DEBUG_PAGEALLOC is not set
  599. @@ -5479,6 +5533,7 @@
  600. # CONFIG_DEBUG_RODATA_TEST is not set
  601. # CONFIG_DEBUG_SET_MODULE_RONX is not set
  602. # CONFIG_DEBUG_NX_TEST is not set
  603. +# CONFIG_DEBUG_TLBFLUSH is not set
  604. # CONFIG_IOMMU_DEBUG is not set
  605. # CONFIG_IOMMU_STRESS is not set
  606. CONFIG_HAVE_MMIOTRACE_SUPPORT=y
  607. @@ -5564,6 +5619,8 @@
  608. CONFIG_CRYPTO_CRYPTD=m
  609. CONFIG_CRYPTO_AUTHENC=m
  610. CONFIG_CRYPTO_TEST=m
  611. +CONFIG_CRYPTO_ABLK_HELPER_X86=m
  612. +CONFIG_CRYPTO_GLUE_HELPER_X86=m
  613.  
  614. #
  615. # Authenticated Encryption with Associated Data
  616. @@ -5634,11 +5691,13 @@
  617. CONFIG_CRYPTO_SEED=m
  618. CONFIG_CRYPTO_SERPENT=m
  619. CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
  620. +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
  621. CONFIG_CRYPTO_TEA=m
  622. CONFIG_CRYPTO_TWOFISH=m
  623. CONFIG_CRYPTO_TWOFISH_COMMON=m
  624. CONFIG_CRYPTO_TWOFISH_X86_64=m
  625. CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
  626. +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
  627.  
  628. #
  629. # Compression
  630. @@ -5671,6 +5730,7 @@
  631. CONFIG_KVM_AMD=m
  632. CONFIG_KVM_MMU_AUDIT=y
  633. CONFIG_VHOST_NET=m
  634. +CONFIG_TCM_VHOST=m
  635. CONFIG_BINARY_PRINTF=y
  636.  
  637. #
  638. @@ -5734,6 +5794,7 @@
  639. CONFIG_CPU_RMAP=y
  640. CONFIG_DQL=y
  641. CONFIG_NLATTR=y
  642. +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
  643. CONFIG_LRU_CACHE=m
  644. CONFIG_AVERAGE=y
  645. CONFIG_CORDIC=m
RAW Paste Data