リビジョン | 1e5759d762ec83ac542aad8aafe5352dba163da4 (tree) |
---|---|
日時 | 2014-08-09 10:28:26 |
作者 | Chih-Wei Huang <cwhuang@linu...> |
コミッター | Chih-Wei Huang |
android-x86: update defconfig to 3.10.52
@@ -1,6 +1,6 @@ | ||
1 | 1 | # |
2 | 2 | # Automatically generated file; DO NOT EDIT. |
3 | -# Linux/x86 3.10.30 Kernel Configuration | |
3 | +# Linux/x86 3.10.52 Kernel Configuration | |
4 | 4 | # |
5 | 5 | CONFIG_64BIT=y |
6 | 6 | CONFIG_X86_64=y |
@@ -300,6 +300,7 @@ CONFIG_DEFAULT_CFQ=y | ||
300 | 300 | CONFIG_DEFAULT_IOSCHED="cfq" |
301 | 301 | CONFIG_PREEMPT_NOTIFIERS=y |
302 | 302 | CONFIG_UNINLINE_SPIN_UNLOCK=y |
303 | +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y | |
303 | 304 | CONFIG_MUTEX_SPIN_ON_OWNER=y |
304 | 305 | CONFIG_FREEZER=y |
305 | 306 |
@@ -359,6 +360,7 @@ CONFIG_X86_MCE_AMD=y | ||
359 | 360 | CONFIG_X86_MCE_THRESHOLD=y |
360 | 361 | # CONFIG_X86_MCE_INJECT is not set |
361 | 362 | CONFIG_X86_THERMAL_VECTOR=y |
363 | +# CONFIG_X86_16BIT is not set | |
362 | 364 | CONFIG_I8K=m |
363 | 365 | CONFIG_MICROCODE=y |
364 | 366 | CONFIG_MICROCODE_INTEL=y |
@@ -1317,6 +1319,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y | ||
1317 | 1319 | # |
1318 | 1320 | CONFIG_TI_ST=m |
1319 | 1321 | CONFIG_SENSORS_LIS3_I2C=m |
1322 | +CONFIG_SENSORS_LIS3_I2C_WMI=y | |
1320 | 1323 | |
1321 | 1324 | # |
1322 | 1325 | # Altera FPGA firmware download module |
@@ -1452,7 +1455,7 @@ CONFIG_SCSI_UFSHCD=m | ||
1452 | 1455 | # CONFIG_SCSI_HPTIOP is not set |
1453 | 1456 | # CONFIG_SCSI_BUSLOGIC is not set |
1454 | 1457 | CONFIG_VMWARE_PVSCSI=m |
1455 | -CONFIG_HYPERV_STORAGE=m | |
1458 | +CONFIG_HYPERV_STORAGE=y | |
1456 | 1459 | # CONFIG_LIBFC is not set |
1457 | 1460 | # CONFIG_LIBFCOE is not set |
1458 | 1461 | # CONFIG_FCOE is not set |
@@ -2169,20 +2172,20 @@ CONFIG_KEYBOARD_GPIO=m | ||
2169 | 2172 | # CONFIG_KEYBOARD_SUNKBD is not set |
2170 | 2173 | # CONFIG_KEYBOARD_XTKBD is not set |
2171 | 2174 | CONFIG_INPUT_MOUSE=y |
2172 | -CONFIG_MOUSE_PS2=y | |
2173 | -# CONFIG_MOUSE_PS2_ALPS is not set | |
2174 | -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set | |
2175 | -# CONFIG_MOUSE_PS2_SYNAPTICS is not set | |
2175 | +CONFIG_MOUSE_PS2=m | |
2176 | +CONFIG_MOUSE_PS2_ALPS=y | |
2177 | +CONFIG_MOUSE_PS2_LOGIPS2PP=y | |
2178 | +CONFIG_MOUSE_PS2_SYNAPTICS=y | |
2176 | 2179 | CONFIG_MOUSE_PS2_CYPRESS=y |
2177 | -# CONFIG_MOUSE_PS2_LIFEBOOK is not set | |
2178 | -# CONFIG_MOUSE_PS2_TRACKPOINT is not set | |
2179 | -# CONFIG_MOUSE_PS2_ELANTECH is not set | |
2180 | -# CONFIG_MOUSE_PS2_SENTELIC is not set | |
2181 | -# CONFIG_MOUSE_PS2_TOUCHKIT is not set | |
2182 | -CONFIG_MOUSE_SERIAL=y | |
2180 | +CONFIG_MOUSE_PS2_LIFEBOOK=y | |
2181 | +CONFIG_MOUSE_PS2_TRACKPOINT=y | |
2182 | +CONFIG_MOUSE_PS2_ELANTECH=y | |
2183 | +CONFIG_MOUSE_PS2_SENTELIC=y | |
2184 | +CONFIG_MOUSE_PS2_TOUCHKIT=y | |
2185 | +CONFIG_MOUSE_SERIAL=m | |
2183 | 2186 | CONFIG_MOUSE_APPLETOUCH=m |
2184 | 2187 | CONFIG_MOUSE_BCM5974=m |
2185 | -# CONFIG_MOUSE_CYAPA is not set | |
2188 | +CONFIG_MOUSE_CYAPA=m | |
2186 | 2189 | CONFIG_MOUSE_VSXXXAA=m |
2187 | 2190 | CONFIG_MOUSE_GPIO=m |
2188 | 2191 | CONFIG_MOUSE_SYNAPTICS_I2C=m |
@@ -2285,7 +2288,7 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m | ||
2285 | 2288 | CONFIG_TOUCHSCREEN_TSC_SERIO=m |
2286 | 2289 | CONFIG_TOUCHSCREEN_TSC2005=m |
2287 | 2290 | CONFIG_TOUCHSCREEN_TSC2007=m |
2288 | -# CONFIG_TOUCHSCREEN_W90X900 is not set | |
2291 | +CONFIG_TOUCHSCREEN_W90X900=m | |
2289 | 2292 | CONFIG_TOUCHSCREEN_ST1232=m |
2290 | 2293 | CONFIG_TOUCHSCREEN_TPS6507X=m |
2291 | 2294 | CONFIG_INPUT_MISC=y |
@@ -2309,7 +2312,7 @@ CONFIG_INPUT_POWERMATE=m | ||
2309 | 2312 | CONFIG_INPUT_YEALINK=m |
2310 | 2313 | CONFIG_INPUT_CM109=m |
2311 | 2314 | CONFIG_INPUT_UINPUT=y |
2312 | -# CONFIG_INPUT_GPIO is not set | |
2315 | +CONFIG_INPUT_GPIO=m | |
2313 | 2316 | CONFIG_INPUT_PCF8574=m |
2314 | 2317 | # CONFIG_INPUT_PWM_BEEPER is not set |
2315 | 2318 | CONFIG_INPUT_GPIO_ROTARY_ENCODER=m |
@@ -2331,14 +2334,14 @@ CONFIG_SERIO_PARKBD=m | ||
2331 | 2334 | CONFIG_SERIO_PCIPS2=y |
2332 | 2335 | CONFIG_SERIO_LIBPS2=y |
2333 | 2336 | CONFIG_SERIO_RAW=y |
2334 | -# CONFIG_SERIO_ALTERA_PS2 is not set | |
2335 | -# CONFIG_SERIO_PS2MULT is not set | |
2336 | -# CONFIG_SERIO_ARC_PS2 is not set | |
2337 | +CONFIG_SERIO_ALTERA_PS2=m | |
2338 | +CONFIG_SERIO_PS2MULT=m | |
2339 | +CONFIG_SERIO_ARC_PS2=m | |
2337 | 2340 | CONFIG_GAMEPORT=m |
2338 | -# CONFIG_GAMEPORT_NS558 is not set | |
2339 | -# CONFIG_GAMEPORT_L4 is not set | |
2340 | -# CONFIG_GAMEPORT_EMU10K1 is not set | |
2341 | -# CONFIG_GAMEPORT_FM801 is not set | |
2341 | +CONFIG_GAMEPORT_NS558=m | |
2342 | +CONFIG_GAMEPORT_L4=m | |
2343 | +CONFIG_GAMEPORT_EMU10K1=m | |
2344 | +CONFIG_GAMEPORT_FM801=m | |
2342 | 2345 | |
2343 | 2346 | # |
2344 | 2347 | # Character devices |
@@ -3614,7 +3617,7 @@ CONFIG_DRM_SAVAGE=m | ||
3614 | 3617 | CONFIG_DRM_UDL=m |
3615 | 3618 | CONFIG_DRM_AST=m |
3616 | 3619 | CONFIG_DRM_MGAG200=m |
3617 | -CONFIG_DRM_CIRRUS_QEMU=m | |
3620 | +# CONFIG_DRM_CIRRUS_QEMU is not set | |
3618 | 3621 | # CONFIG_DRM_QXL is not set |
3619 | 3622 | CONFIG_VGASTATE=m |
3620 | 3623 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -3642,7 +3645,7 @@ CONFIG_FB_TILEBLITTING=y | ||
3642 | 3645 | # |
3643 | 3646 | # Frame buffer hardware drivers |
3644 | 3647 | # |
3645 | -CONFIG_FB_CIRRUS=m | |
3648 | +# CONFIG_FB_CIRRUS is not set | |
3646 | 3649 | # CONFIG_FB_PM2 is not set |
3647 | 3650 | # CONFIG_FB_CYBER2000 is not set |
3648 | 3651 | # CONFIG_FB_ARC is not set |
@@ -4555,7 +4558,7 @@ CONFIG_VIRTIO_MMIO=m | ||
4555 | 4558 | # |
4556 | 4559 | # Microsoft Hyper-V guest support |
4557 | 4560 | # |
4558 | -CONFIG_HYPERV=m | |
4561 | +CONFIG_HYPERV=y | |
4559 | 4562 | CONFIG_HYPERV_UTILS=m |
4560 | 4563 | CONFIG_HYPERV_BALLOON=m |
4561 | 4564 | CONFIG_STAGING=y |
@@ -1,6 +1,6 @@ | ||
1 | 1 | # |
2 | 2 | # Automatically generated file; DO NOT EDIT. |
3 | -# Linux/x86 3.10.30 Kernel Configuration | |
3 | +# Linux/x86 3.10.52 Kernel Configuration | |
4 | 4 | # |
5 | 5 | # CONFIG_64BIT is not set |
6 | 6 | CONFIG_X86_32=y |
@@ -295,6 +295,7 @@ CONFIG_DEFAULT_CFQ=y | ||
295 | 295 | CONFIG_DEFAULT_IOSCHED="cfq" |
296 | 296 | CONFIG_PREEMPT_NOTIFIERS=y |
297 | 297 | CONFIG_UNINLINE_SPIN_UNLOCK=y |
298 | +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y | |
298 | 299 | CONFIG_MUTEX_SPIN_ON_OWNER=y |
299 | 300 | CONFIG_FREEZER=y |
300 | 301 |
@@ -387,6 +388,7 @@ CONFIG_X86_MCE_THRESHOLD=y | ||
387 | 388 | # CONFIG_X86_MCE_INJECT is not set |
388 | 389 | CONFIG_X86_THERMAL_VECTOR=y |
389 | 390 | CONFIG_VM86=y |
391 | +# CONFIG_X86_16BIT is not set | |
390 | 392 | CONFIG_TOSHIBA=m |
391 | 393 | CONFIG_I8K=m |
392 | 394 | CONFIG_X86_REBOOTFIXUPS=y |
@@ -1395,6 +1397,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y | ||
1395 | 1397 | # |
1396 | 1398 | CONFIG_TI_ST=m |
1397 | 1399 | CONFIG_SENSORS_LIS3_I2C=m |
1400 | +CONFIG_SENSORS_LIS3_I2C_WMI=y | |
1398 | 1401 | |
1399 | 1402 | # |
1400 | 1403 | # Altera FPGA firmware download module |
@@ -1550,7 +1553,7 @@ CONFIG_SCSI_UFSHCD=m | ||
1550 | 1553 | # CONFIG_SCSI_HPTIOP is not set |
1551 | 1554 | # CONFIG_SCSI_BUSLOGIC is not set |
1552 | 1555 | CONFIG_VMWARE_PVSCSI=m |
1553 | -CONFIG_HYPERV_STORAGE=m | |
1556 | +CONFIG_HYPERV_STORAGE=y | |
1554 | 1557 | # CONFIG_LIBFC is not set |
1555 | 1558 | # CONFIG_LIBFCOE is not set |
1556 | 1559 | # CONFIG_FCOE is not set |
@@ -2296,21 +2299,21 @@ CONFIG_KEYBOARD_GPIO=m | ||
2296 | 2299 | # CONFIG_KEYBOARD_SUNKBD is not set |
2297 | 2300 | # CONFIG_KEYBOARD_XTKBD is not set |
2298 | 2301 | CONFIG_INPUT_MOUSE=y |
2299 | -CONFIG_MOUSE_PS2=y | |
2300 | -# CONFIG_MOUSE_PS2_ALPS is not set | |
2301 | -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set | |
2302 | -# CONFIG_MOUSE_PS2_SYNAPTICS is not set | |
2302 | +CONFIG_MOUSE_PS2=m | |
2303 | +CONFIG_MOUSE_PS2_ALPS=y | |
2304 | +CONFIG_MOUSE_PS2_LOGIPS2PP=y | |
2305 | +CONFIG_MOUSE_PS2_SYNAPTICS=y | |
2303 | 2306 | CONFIG_MOUSE_PS2_CYPRESS=y |
2304 | -# CONFIG_MOUSE_PS2_LIFEBOOK is not set | |
2305 | -# CONFIG_MOUSE_PS2_TRACKPOINT is not set | |
2306 | -# CONFIG_MOUSE_PS2_ELANTECH is not set | |
2307 | -# CONFIG_MOUSE_PS2_SENTELIC is not set | |
2308 | -# CONFIG_MOUSE_PS2_TOUCHKIT is not set | |
2309 | -# CONFIG_MOUSE_PS2_OLPC is not set | |
2310 | -CONFIG_MOUSE_SERIAL=y | |
2307 | +CONFIG_MOUSE_PS2_LIFEBOOK=y | |
2308 | +CONFIG_MOUSE_PS2_TRACKPOINT=y | |
2309 | +CONFIG_MOUSE_PS2_ELANTECH=y | |
2310 | +CONFIG_MOUSE_PS2_SENTELIC=y | |
2311 | +CONFIG_MOUSE_PS2_TOUCHKIT=y | |
2312 | +CONFIG_MOUSE_PS2_OLPC=y | |
2313 | +CONFIG_MOUSE_SERIAL=m | |
2311 | 2314 | CONFIG_MOUSE_APPLETOUCH=m |
2312 | 2315 | CONFIG_MOUSE_BCM5974=m |
2313 | -# CONFIG_MOUSE_CYAPA is not set | |
2316 | +CONFIG_MOUSE_CYAPA=m | |
2314 | 2317 | CONFIG_MOUSE_INPORT=m |
2315 | 2318 | # CONFIG_MOUSE_ATIXL is not set |
2316 | 2319 | CONFIG_MOUSE_LOGIBM=m |
@@ -2420,7 +2423,7 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m | ||
2420 | 2423 | CONFIG_TOUCHSCREEN_TSC_SERIO=m |
2421 | 2424 | CONFIG_TOUCHSCREEN_TSC2005=m |
2422 | 2425 | CONFIG_TOUCHSCREEN_TSC2007=m |
2423 | -# CONFIG_TOUCHSCREEN_W90X900 is not set | |
2426 | +CONFIG_TOUCHSCREEN_W90X900=m | |
2424 | 2427 | CONFIG_TOUCHSCREEN_ST1232=m |
2425 | 2428 | CONFIG_TOUCHSCREEN_TPS6507X=m |
2426 | 2429 | CONFIG_INPUT_MISC=y |
@@ -2445,7 +2448,7 @@ CONFIG_INPUT_POWERMATE=m | ||
2445 | 2448 | CONFIG_INPUT_YEALINK=m |
2446 | 2449 | CONFIG_INPUT_CM109=m |
2447 | 2450 | CONFIG_INPUT_UINPUT=y |
2448 | -# CONFIG_INPUT_GPIO is not set | |
2451 | +CONFIG_INPUT_GPIO=m | |
2449 | 2452 | CONFIG_INPUT_PCF8574=m |
2450 | 2453 | # CONFIG_INPUT_PWM_BEEPER is not set |
2451 | 2454 | CONFIG_INPUT_GPIO_ROTARY_ENCODER=m |
@@ -2467,15 +2470,15 @@ CONFIG_SERIO_PARKBD=m | ||
2467 | 2470 | CONFIG_SERIO_PCIPS2=y |
2468 | 2471 | CONFIG_SERIO_LIBPS2=y |
2469 | 2472 | CONFIG_SERIO_RAW=y |
2470 | -# CONFIG_SERIO_ALTERA_PS2 is not set | |
2471 | -# CONFIG_SERIO_PS2MULT is not set | |
2472 | -# CONFIG_SERIO_ARC_PS2 is not set | |
2473 | -# CONFIG_SERIO_APBPS2 is not set | |
2473 | +CONFIG_SERIO_ALTERA_PS2=m | |
2474 | +CONFIG_SERIO_PS2MULT=m | |
2475 | +CONFIG_SERIO_ARC_PS2=m | |
2476 | +CONFIG_SERIO_APBPS2=m | |
2474 | 2477 | CONFIG_GAMEPORT=m |
2475 | -# CONFIG_GAMEPORT_NS558 is not set | |
2476 | -# CONFIG_GAMEPORT_L4 is not set | |
2477 | -# CONFIG_GAMEPORT_EMU10K1 is not set | |
2478 | -# CONFIG_GAMEPORT_FM801 is not set | |
2478 | +CONFIG_GAMEPORT_NS558=m | |
2479 | +CONFIG_GAMEPORT_L4=m | |
2480 | +CONFIG_GAMEPORT_EMU10K1=m | |
2481 | +CONFIG_GAMEPORT_FM801=m | |
2479 | 2482 | |
2480 | 2483 | # |
2481 | 2484 | # Character devices |
@@ -3790,7 +3793,7 @@ CONFIG_DRM_SAVAGE=m | ||
3790 | 3793 | CONFIG_DRM_UDL=m |
3791 | 3794 | CONFIG_DRM_AST=m |
3792 | 3795 | CONFIG_DRM_MGAG200=m |
3793 | -CONFIG_DRM_CIRRUS_QEMU=m | |
3796 | +# CONFIG_DRM_CIRRUS_QEMU is not set | |
3794 | 3797 | # CONFIG_DRM_QXL is not set |
3795 | 3798 | CONFIG_VGASTATE=m |
3796 | 3799 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -3818,7 +3821,7 @@ CONFIG_FB_TILEBLITTING=y | ||
3818 | 3821 | # |
3819 | 3822 | # Frame buffer hardware drivers |
3820 | 3823 | # |
3821 | -CONFIG_FB_CIRRUS=m | |
3824 | +# CONFIG_FB_CIRRUS is not set | |
3822 | 3825 | # CONFIG_FB_PM2 is not set |
3823 | 3826 | # CONFIG_FB_CYBER2000 is not set |
3824 | 3827 | # CONFIG_FB_ARC is not set |
@@ -3831,10 +3834,7 @@ CONFIG_FB_EFI=y | ||
3831 | 3834 | # CONFIG_FB_N411 is not set |
3832 | 3835 | # CONFIG_FB_HGA is not set |
3833 | 3836 | # CONFIG_FB_S1D13XXX is not set |
3834 | -CONFIG_FB_NVIDIA=m | |
3835 | -# CONFIG_FB_NVIDIA_I2C is not set | |
3836 | -# CONFIG_FB_NVIDIA_DEBUG is not set | |
3837 | -CONFIG_FB_NVIDIA_BACKLIGHT=y | |
3837 | +# CONFIG_FB_NVIDIA is not set | |
3838 | 3838 | CONFIG_FB_RIVA=m |
3839 | 3839 | # CONFIG_FB_RIVA_I2C is not set |
3840 | 3840 | # CONFIG_FB_RIVA_DEBUG is not set |
@@ -3851,10 +3851,7 @@ CONFIG_FB_MATROX_MYSTIQUE=y | ||
3851 | 3851 | CONFIG_FB_MATROX_G=y |
3852 | 3852 | CONFIG_FB_MATROX_I2C=m |
3853 | 3853 | CONFIG_FB_MATROX_MAVEN=m |
3854 | -CONFIG_FB_RADEON=m | |
3855 | -CONFIG_FB_RADEON_I2C=y | |
3856 | -CONFIG_FB_RADEON_BACKLIGHT=y | |
3857 | -# CONFIG_FB_RADEON_DEBUG is not set | |
3854 | +# CONFIG_FB_RADEON is not set | |
3858 | 3855 | CONFIG_FB_ATY128=m |
3859 | 3856 | CONFIG_FB_ATY128_BACKLIGHT=y |
3860 | 3857 | CONFIG_FB_ATY=m |
@@ -4781,7 +4778,7 @@ CONFIG_VIRTIO_MMIO=m | ||
4781 | 4778 | # |
4782 | 4779 | # Microsoft Hyper-V guest support |
4783 | 4780 | # |
4784 | -CONFIG_HYPERV=m | |
4781 | +CONFIG_HYPERV=y | |
4785 | 4782 | CONFIG_HYPERV_UTILS=m |
4786 | 4783 | CONFIG_HYPERV_BALLOON=m |
4787 | 4784 | CONFIG_STAGING=y |