[kernel] backport two changes from kernel.org:

[openwrt.git] / target / linux / x86 / config-default

diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 0a66825..eff0b28 100644 (file)
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -5,6 +5,8 @@ CONFIG_4KSTACKS=y
 # CONFIG_AC3200 is not set
 # CONFIG_ACPI is not set
 # CONFIG_ACPI_CMPC is not set
 # CONFIG_AC3200 is not set
 # CONFIG_ACPI is not set
 # CONFIG_ACPI_CMPC is not set

+# CONFIG_ACPI_EC_DEBUGFS is not set
+# CONFIG_ACPI_QUICKSTART is not set

 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set


@@ -99,7 +101,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 # CONFIG_ELPLUS is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_ELF_CORE=y
 # CONFIG_ELPLUS is not set
 # CONFIG_EUROTECH_WDT is not set

-CONFIG_EXT2_FS=y
+CONFIG_EXT4_FS=y

 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y


@@ -176,6 +178,7 @@ CONFIG_HW_RANDOM_VIA=y
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INPUT is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INPUT is not set

+# CONFIG_INTEL_IPS is not set

 # CONFIG_INTEL_MENLOW is not set
 # CONFIG_IOMMU_API is not set
 # CONFIG_IOMMU_HELPER is not set
 # CONFIG_INTEL_MENLOW is not set
 # CONFIG_IOMMU_API is not set
 # CONFIG_IOMMU_HELPER is not set


@@ -259,6 +262,7 @@ CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set

+# CONFIG_OLPC_OPENFIRMWARE is not set

 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y