device/ibm/thinkpad
Revisión | e0a84299ebf6f73336f71e043c6214d18b2cc437 (tree) |
---|---|
Tiempo | 2012-02-16 07:27:36 |
Autor | Stefan Seidel <android@stef...> |
Commiter | Stefan Seidel |
enable some acpi stuff, set interactive cpu govenor as default, disable vga console
@@ -176,7 +176,6 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y | ||
176 | 176 | # |
177 | 177 | # GCOV-based kernel profiling |
178 | 178 | # |
179 | -# CONFIG_GCOV_KERNEL is not set | |
180 | 179 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
181 | 180 | CONFIG_SLABINFO=y |
182 | 181 | CONFIG_RT_MUTEXES=y |
@@ -407,16 +406,16 @@ CONFIG_EARLYSUSPEND=y | ||
407 | 406 | # CONFIG_CONSOLE_EARLYSUSPEND is not set |
408 | 407 | CONFIG_FB_EARLYSUSPEND=y |
409 | 408 | CONFIG_PM_SLEEP=y |
410 | -# CONFIG_PM_RUNTIME is not set | |
409 | +CONFIG_PM_RUNTIME=y | |
411 | 410 | CONFIG_PM=y |
412 | 411 | # CONFIG_PM_DEBUG is not set |
413 | -# CONFIG_SUSPEND_TIME is not set | |
412 | +CONFIG_SUSPEND_TIME=y | |
414 | 413 | CONFIG_ACPI=y |
415 | 414 | CONFIG_ACPI_SLEEP=y |
416 | -# CONFIG_ACPI_PROCFS is not set | |
417 | -# CONFIG_ACPI_PROCFS_POWER is not set | |
415 | +CONFIG_ACPI_PROCFS=y | |
416 | +CONFIG_ACPI_PROCFS_POWER=y | |
418 | 417 | # CONFIG_ACPI_EC_DEBUGFS is not set |
419 | -# CONFIG_ACPI_PROC_EVENT is not set | |
418 | +CONFIG_ACPI_PROC_EVENT=y | |
420 | 419 | CONFIG_ACPI_AC=y |
421 | 420 | CONFIG_ACPI_BATTERY=y |
422 | 421 | CONFIG_ACPI_BUTTON=y |
@@ -434,7 +433,6 @@ CONFIG_X86_PM_TIMER=y | ||
434 | 433 | CONFIG_ACPI_CONTAINER=y |
435 | 434 | CONFIG_ACPI_SBS=y |
436 | 435 | # CONFIG_ACPI_HED is not set |
437 | -# CONFIG_ACPI_CUSTOM_METHOD is not set | |
438 | 436 | # CONFIG_ACPI_APEI is not set |
439 | 437 | CONFIG_SFI=y |
440 | 438 | # CONFIG_APM is not set |
@@ -448,15 +446,15 @@ CONFIG_CPU_FREQ_STAT=y | ||
448 | 446 | CONFIG_CPU_FREQ_STAT_DETAILS=y |
449 | 447 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
450 | 448 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
451 | -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y | |
449 | +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | |
452 | 450 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
453 | 451 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
454 | -# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set | |
452 | +CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y | |
455 | 453 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
456 | 454 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y |
457 | 455 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
458 | 456 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
459 | -# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set | |
457 | +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y | |
460 | 458 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
461 | 459 | |
462 | 460 | # |
@@ -485,7 +483,7 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y | ||
485 | 483 | CONFIG_CPU_IDLE=y |
486 | 484 | CONFIG_CPU_IDLE_GOV_LADDER=y |
487 | 485 | CONFIG_CPU_IDLE_GOV_MENU=y |
488 | -# CONFIG_INTEL_IDLE is not set | |
486 | +CONFIG_INTEL_IDLE=y | |
489 | 487 | |
490 | 488 | # |
491 | 489 | # Bus options (PCI etc.) |
@@ -506,7 +504,9 @@ CONFIG_PCIEPORTBUS=y | ||
506 | 504 | CONFIG_PCIEAER=y |
507 | 505 | # CONFIG_PCIE_ECRC is not set |
508 | 506 | # CONFIG_PCIEAER_INJECT is not set |
509 | -# CONFIG_PCIEASPM is not set | |
507 | +CONFIG_PCIEASPM=y | |
508 | +# CONFIG_PCIEASPM_DEBUG is not set | |
509 | +CONFIG_PCIE_PME=y | |
510 | 510 | CONFIG_ARCH_SUPPORTS_MSI=y |
511 | 511 | CONFIG_PCI_MSI=y |
512 | 512 | # CONFIG_PCI_STUB is not set |
@@ -845,7 +845,6 @@ CONFIG_CFG80211=m | ||
845 | 845 | # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set |
846 | 846 | # CONFIG_CFG80211_REG_DEBUG is not set |
847 | 847 | CONFIG_CFG80211_DEFAULT_PS=y |
848 | -# CONFIG_CFG80211_DEBUGFS is not set | |
849 | 848 | # CONFIG_CFG80211_INTERNAL_REGDB is not set |
850 | 849 | CONFIG_CFG80211_WEXT=y |
851 | 850 | CONFIG_WIRELESS_EXT_SYSFS=y |
@@ -864,7 +863,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y | ||
864 | 863 | CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" |
865 | 864 | # CONFIG_MAC80211_MESH is not set |
866 | 865 | CONFIG_MAC80211_LEDS=y |
867 | -# CONFIG_MAC80211_DEBUGFS is not set | |
868 | 866 | # CONFIG_MAC80211_DEBUG_MENU is not set |
869 | 867 | # CONFIG_WIMAX is not set |
870 | 868 | CONFIG_RFKILL=m |
@@ -1237,10 +1235,8 @@ CONFIG_ATH9K_COMMON=m | ||
1237 | 1235 | CONFIG_ATH9K=m |
1238 | 1236 | CONFIG_ATH9K_PCI=y |
1239 | 1237 | # CONFIG_ATH9K_AHB is not set |
1240 | -# CONFIG_ATH9K_DEBUGFS is not set | |
1241 | 1238 | CONFIG_ATH9K_RATE_CONTROL=y |
1242 | 1239 | CONFIG_ATH9K_HTC=m |
1243 | -# CONFIG_ATH9K_HTC_DEBUGFS is not set | |
1244 | 1240 | CONFIG_CARL9170=m |
1245 | 1241 | CONFIG_CARL9170_LEDS=y |
1246 | 1242 | CONFIG_CARL9170_WPC=y |
@@ -1259,8 +1255,14 @@ CONFIG_IPW2200_QOS=y | ||
1259 | 1255 | CONFIG_LIBIPW=m |
1260 | 1256 | # CONFIG_LIBIPW_DEBUG is not set |
1261 | 1257 | # CONFIG_IWLAGN is not set |
1258 | +CONFIG_IWLWIFI_LEGACY=m | |
1259 | + | |
1260 | +# | |
1261 | +# Debugging Options | |
1262 | +# | |
1263 | +# CONFIG_IWLWIFI_LEGACY_DEBUG is not set | |
1262 | 1264 | # CONFIG_IWL4965 is not set |
1263 | -# CONFIG_IWL3945 is not set | |
1265 | +CONFIG_IWL3945=m | |
1264 | 1266 | # CONFIG_IWM is not set |
1265 | 1267 | # CONFIG_LIBERTAS is not set |
1266 | 1268 | # CONFIG_HERMES is not set |
@@ -1515,7 +1517,7 @@ CONFIG_VT=y | ||
1515 | 1517 | CONFIG_CONSOLE_TRANSLATIONS=y |
1516 | 1518 | CONFIG_VT_CONSOLE=y |
1517 | 1519 | CONFIG_HW_CONSOLE=y |
1518 | -CONFIG_VT_HW_CONSOLE_BINDING=y | |
1520 | +# CONFIG_VT_HW_CONSOLE_BINDING is not set | |
1519 | 1521 | CONFIG_UNIX98_PTYS=y |
1520 | 1522 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
1521 | 1523 | CONFIG_LEGACY_PTYS=y |
@@ -1891,9 +1893,6 @@ CONFIG_MEDIA_TUNER_XC2028=m | ||
1891 | 1893 | CONFIG_MEDIA_TUNER_XC5000=m |
1892 | 1894 | CONFIG_MEDIA_TUNER_MC44S803=m |
1893 | 1895 | CONFIG_VIDEO_V4L2=m |
1894 | -CONFIG_VIDEOBUF2_CORE=m | |
1895 | -CONFIG_VIDEOBUF2_MEMOPS=m | |
1896 | -CONFIG_VIDEOBUF2_VMALLOC=m | |
1897 | 1896 | CONFIG_VIDEO_CAPTURE_DRIVERS=y |
1898 | 1897 | # CONFIG_VIDEO_ADV_DEBUG is not set |
1899 | 1898 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set |
@@ -1935,7 +1934,7 @@ CONFIG_VIDEO_IR_I2C=m | ||
1935 | 1934 | # |
1936 | 1935 | # Miscelaneous helper chips |
1937 | 1936 | # |
1938 | -CONFIG_VIDEO_VIVI=m | |
1937 | +# CONFIG_VIDEO_VIVI is not set | |
1939 | 1938 | # CONFIG_VIDEO_BT848 is not set |
1940 | 1939 | # CONFIG_VIDEO_CPIA2 is not set |
1941 | 1940 | # CONFIG_VIDEO_ZORAN is not set |
@@ -1970,12 +1969,12 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
1970 | 1969 | # |
1971 | 1970 | # Graphics support |
1972 | 1971 | # |
1973 | -CONFIG_AGP=y | |
1972 | +CONFIG_AGP=m | |
1974 | 1973 | # CONFIG_AGP_ALI is not set |
1975 | 1974 | # CONFIG_AGP_ATI is not set |
1976 | 1975 | # CONFIG_AGP_AMD is not set |
1977 | 1976 | # CONFIG_AGP_AMD64 is not set |
1978 | -CONFIG_AGP_INTEL=y | |
1977 | +CONFIG_AGP_INTEL=m | |
1979 | 1978 | # CONFIG_AGP_NVIDIA is not set |
1980 | 1979 | # CONFIG_AGP_SIS is not set |
1981 | 1980 | # CONFIG_AGP_SWORKS is not set |
@@ -2031,7 +2030,7 @@ CONFIG_FB_TILEBLITTING=y | ||
2031 | 2030 | # CONFIG_FB_ASILIANT is not set |
2032 | 2031 | # CONFIG_FB_IMSTT is not set |
2033 | 2032 | # CONFIG_FB_VGA16 is not set |
2034 | -CONFIG_FB_UVESA=m | |
2033 | +# CONFIG_FB_UVESA is not set | |
2035 | 2034 | CONFIG_FB_VESA=y |
2036 | 2035 | # CONFIG_FB_N411 is not set |
2037 | 2036 | # CONFIG_FB_HGA is not set |
@@ -2084,24 +2083,14 @@ CONFIG_BACKLIGHT_GENERIC=m | ||
2084 | 2083 | # |
2085 | 2084 | # Console display driver support |
2086 | 2085 | # |
2087 | -CONFIG_VGA_CONSOLE=y | |
2088 | -CONFIG_VGACON_SOFT_SCROLLBACK=y | |
2089 | -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | |
2086 | +# CONFIG_VGA_CONSOLE is not set | |
2090 | 2087 | CONFIG_DUMMY_CONSOLE=y |
2091 | 2088 | CONFIG_FRAMEBUFFER_CONSOLE=y |
2092 | 2089 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y |
2093 | 2090 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
2094 | -CONFIG_FONTS=y | |
2095 | -# CONFIG_FONT_8x8 is not set | |
2091 | +# CONFIG_FONTS is not set | |
2092 | +CONFIG_FONT_8x8=y | |
2096 | 2093 | CONFIG_FONT_8x16=y |
2097 | -# CONFIG_FONT_6x11 is not set | |
2098 | -# CONFIG_FONT_7x14 is not set | |
2099 | -# CONFIG_FONT_PEARL_8x8 is not set | |
2100 | -# CONFIG_FONT_ACORN_8x8 is not set | |
2101 | -# CONFIG_FONT_MINI_4x6 is not set | |
2102 | -# CONFIG_FONT_SUN8x16 is not set | |
2103 | -# CONFIG_FONT_SUN12x22 is not set | |
2104 | -# CONFIG_FONT_10x18 is not set | |
2105 | 2094 | # CONFIG_LOGO is not set |
2106 | 2095 | CONFIG_SOUND=y |
2107 | 2096 | # CONFIG_SOUND_OSS_CORE is not set |
@@ -2318,6 +2307,8 @@ CONFIG_USB=y | ||
2318 | 2307 | # CONFIG_USB_DEVICEFS is not set |
2319 | 2308 | # CONFIG_USB_DEVICE_CLASS is not set |
2320 | 2309 | # CONFIG_USB_DYNAMIC_MINORS is not set |
2310 | +CONFIG_USB_SUSPEND=y | |
2311 | +# CONFIG_USB_OTG is not set | |
2321 | 2312 | # CONFIG_USB_OTG_WHITELIST is not set |
2322 | 2313 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
2323 | 2314 | # CONFIG_USB_MON is not set |
@@ -2648,7 +2639,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y | ||
2648 | 2639 | # CONFIG_DRM_VMWGFX is not set |
2649 | 2640 | CONFIG_DRM_NOUVEAU=m |
2650 | 2641 | CONFIG_DRM_NOUVEAU_BACKLIGHT=y |
2651 | -CONFIG_DRM_NOUVEAU_DEBUG=y | |
2652 | 2642 | |
2653 | 2643 | # |
2654 | 2644 | # I2C encoder or helper chips |
@@ -2768,9 +2758,7 @@ CONFIG_EXT4_FS_XATTR=y | ||
2768 | 2758 | # CONFIG_EXT4_FS_SECURITY is not set |
2769 | 2759 | # CONFIG_EXT4_DEBUG is not set |
2770 | 2760 | CONFIG_JBD=y |
2771 | -# CONFIG_JBD_DEBUG is not set | |
2772 | 2761 | CONFIG_JBD2=y |
2773 | -# CONFIG_JBD2_DEBUG is not set | |
2774 | 2762 | CONFIG_FS_MBCACHE=y |
2775 | 2763 | # CONFIG_REISERFS_FS is not set |
2776 | 2764 | # CONFIG_JFS_FS is not set |
@@ -2934,10 +2922,10 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 | ||
2934 | 2922 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
2935 | 2923 | # CONFIG_ENABLE_MUST_CHECK is not set |
2936 | 2924 | CONFIG_FRAME_WARN=1024 |
2937 | -CONFIG_MAGIC_SYSRQ=y | |
2925 | +# CONFIG_MAGIC_SYSRQ is not set | |
2938 | 2926 | # CONFIG_STRIP_ASM_SYMS is not set |
2939 | 2927 | # CONFIG_UNUSED_SYMBOLS is not set |
2940 | -CONFIG_DEBUG_FS=y | |
2928 | +# CONFIG_DEBUG_FS is not set | |
2941 | 2929 | # CONFIG_HEADERS_CHECK is not set |
2942 | 2930 | # CONFIG_DEBUG_SECTION_MISMATCH is not set |
2943 | 2931 | # CONFIG_DEBUG_KERNEL is not set |
@@ -2950,7 +2938,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y | ||
2950 | 2938 | # CONFIG_FRAME_POINTER is not set |
2951 | 2939 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 |
2952 | 2940 | CONFIG_RCU_CPU_STALL_VERBOSE=y |
2953 | -# CONFIG_LKDTM is not set | |
2954 | 2941 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
2955 | 2942 | CONFIG_USER_STACKTRACE_SUPPORT=y |
2956 | 2943 | CONFIG_HAVE_FUNCTION_TRACER=y |
@@ -2964,7 +2951,6 @@ CONFIG_HAVE_C_RECORDMCOUNT=y | ||
2964 | 2951 | CONFIG_TRACING_SUPPORT=y |
2965 | 2952 | # CONFIG_FTRACE is not set |
2966 | 2953 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |
2967 | -# CONFIG_DYNAMIC_DEBUG is not set | |
2968 | 2954 | # CONFIG_DMA_API_DEBUG is not set |
2969 | 2955 | # CONFIG_ATOMIC64_SELFTEST is not set |
2970 | 2956 | # CONFIG_SAMPLES is not set |
@@ -2973,8 +2959,7 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y | ||
2973 | 2959 | # CONFIG_TEST_KSTRTOX is not set |
2974 | 2960 | # CONFIG_STRICT_DEVMEM is not set |
2975 | 2961 | CONFIG_X86_VERBOSE_BOOTUP=y |
2976 | -CONFIG_EARLY_PRINTK=y | |
2977 | -# CONFIG_EARLY_PRINTK_DBGP is not set | |
2962 | +# CONFIG_EARLY_PRINTK is not set | |
2978 | 2963 | # CONFIG_DEBUG_SET_MODULE_RONX is not set |
2979 | 2964 | CONFIG_DOUBLEFAULT=y |
2980 | 2965 | # CONFIG_IOMMU_STRESS is not set |