kernel/3.18: update to version 3.18.25

[openwrt/openwrt.git] / target / linux / generic / config-3.18

diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 8649b8eb67237664310507a05619345f1f7e8f88..36d85907f9cdf6e5fc11cb6221720aad63432ae7 100644 (file)
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -12,6 +12,7 @@ CONFIG_32BIT=y
 # CONFIG_ACERHDF is not set
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_BUTTON is not set
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_EXTLOG is not set
 # CONFIG_ACPI_HED is not set
@@ -1046,6 +1047,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_MXS is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set