aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/generic
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-15 04:43:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-15 04:43:37 +0000
commit65a0244ff80d9da62654fb17564b7c9e16a7b638 (patch)
tree79dded6b122e38eb57b2f1634cfd49ce537d9f1e /target/linux/x86/generic
parentc062741575f4c61416b5ca6542a74db2f0052fc0 (diff)
downloadupstream-65a0244ff80d9da62654fb17564b7c9e16a7b638.tar.gz
upstream-65a0244ff80d9da62654fb17564b7c9e16a7b638.tar.bz2
upstream-65a0244ff80d9da62654fb17564b7c9e16a7b638.zip
x86: refresh kernel config
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44759
Diffstat (limited to 'target/linux/x86/generic')
-rw-r--r--target/linux/x86/generic/config-default11
1 files changed, 7 insertions, 4 deletions
diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index ca7430d420..eb4b357edd 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -12,10 +12,10 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_FAN is not set
# CONFIG_ACPI_I2C_OPREGION is not set
# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_PROCESSOR=y
# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-# CONFIG_ACPI_PROCFS is not set
# CONFIG_ACPI_PROCFS_POWER is not set
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
# CONFIG_ACPI_SBS is not set
@@ -34,6 +34,7 @@ CONFIG_AGP_INTEL=y
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
# CONFIG_APPLE_GMUX is not set
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
# CONFIG_ASUS_LAPTOP is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
@@ -64,7 +65,6 @@ CONFIG_DRM_I915=y
CONFIG_DRM_I915_FBDEV=y
CONFIG_DRM_I915_KMS=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-# CONFIG_DRM_I915_UMS is not set
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_KMS_HELPER=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
@@ -89,6 +89,7 @@ CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CMDLINE=y
# CONFIG_FB_I810 is not set
CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_FILLRECT=y
@@ -103,6 +104,8 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FUJITSU_LAPTOP is not set
# CONFIG_GEOS is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
CONFIG_HDMI=y
CONFIG_HID=y
CONFIG_HID_BATTERY_STRENGTH=y
@@ -122,6 +125,7 @@ CONFIG_INTEL_GTT=y
CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_IPS is not set
# CONFIG_INTEL_MENLOW is not set
+CONFIG_INTERVAL_TREE=y
CONFIG_ISA=y
CONFIG_ISAPNP=y
# CONFIG_ISCSI_IBFT_FIND is not set
@@ -166,6 +170,7 @@ CONFIG_PNPACPI=y
# CONFIG_PNPBIOS is not set
CONFIG_PNP_DEBUG_MESSAGES=y
# CONFIG_PVPANIC is not set
+CONFIG_RAS=y
# CONFIG_SAMSUNG_Q10 is not set
CONFIG_SATA_AHCI=y
# CONFIG_SCx200_ACB is not set
@@ -186,7 +191,6 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_UHCI_HCD=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_VIDEO_OUTPUT_CONTROL=y
# CONFIG_WDT is not set
# CONFIG_X86_ACPI_CPUFREQ is not set
# CONFIG_X86_E_POWERSAVER is not set
@@ -194,4 +198,3 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
# CONFIG_X86_LONGHAUL is not set
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_PM_TIMER=y
-# CONFIG_XO15_EBOOK is not set