diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-12 13:22:52 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-12 14:24:29 -0500 |
| commit | 713abc0c25d574380a3154b9c4d524ac2f5aab29 (patch) | |
| tree | 972ea7d7258b7c6b59f788a7d59a3ecdcde135c5 /config-x86-generic | |
| parent | 6dfcb01411c8465cede72726b709b986754c3ed1 (diff) | |
| download | kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.tar.gz kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.tar.xz kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.zip | |
Linux v3.12-4849-g10d0c97
Replace x86-allow-1024-cpus.patch with the patch that contains the one hunk
not already applied upstream.
Don't install the 'trace' alias symlink for 'perf trace'. Seems much too
generic to just throw that into /usr/bin
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index d2926802e..d120a3ef5 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -40,6 +40,7 @@ CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_PCDP=y CONFIG_FB_EFI=y +CONFIG_EARLY_PRINTK_EFI=y # needs FB_SIMPLE to work correctly # CONFIG_X86_SYSFB is not set @@ -95,6 +96,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_EXTLOG is not set CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_ACPI_CPUFREQ=m @@ -382,6 +384,7 @@ CONFIG_F71808E_WDT=m CONFIG_HPWDT_NMI_DECODING=y # CONFIG_MFD_TPS6586X is not set # CONFIG_INTEL_MID_DMAC is not set +# CONFIG_GPIO_INTEL_MID is not set CONFIG_PCH_DMA=m CONFIG_INTEL_IPS=m # CONFIG_IBM_RTL is not set |