kernel/3.18: update to version 3.18.25

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

diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1
index c8fa2b9745f4423efa52556f7fe4bb0cc3a0cf08..0f76041a6dc7a5c7b893a706b2bd687f99dd7194 100644 (file)
--- a/target/linux/generic/config-4.1
+++ b/target/linux/generic/config-4.1
@@ -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
@@ -233,6 +234,8 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARM_CCN is not set
 # CONFIG_ARM_CRYPTO is not set
 CONFIG_ARM_CPU_TOPOLOGY=y
+# CONFIG_ARM_CPUIDLE is not set
+# CONFIG_ARM_CRYPTO is not set
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_364296 is not set
@@ -265,6 +268,7 @@ CONFIG_ARPD=y
 # CONFIG_ARTHUR is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASM9260_TIMER is not set
+# CONFIG_ASUS_LAPTOP is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
@@ -1078,6 +1082,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
@@ -1094,6 +1099,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
+# CONFIG_FB_SM750 is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_SSD1307 is not set
@@ -1145,6 +1151,7 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FSNOTIFY=y
+# CONFIG_FS_DAX is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FT1000 is not set
 # CONFIG_FTGMAC100 is not set
@@ -1349,6 +1356,7 @@ CONFIG_HPET_MMAP_DEFAULT=y
 # CONFIG_HP_WIRELESS is not set
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
+# CONFIG_HSU_DMA_PCI is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
@@ -2133,6 +2141,7 @@ CONFIG_MII=y
 # CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_CDMM is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_FPU_EMULATOR is not set
 # CONFIG_MIPS_MALTA is not set
@@ -2342,7 +2351,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_ROM is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
@@ -2576,6 +2584,7 @@ CONFIG_NET_SCH_FQ_CODEL=y
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCTPPROBE is not set
 # CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 # CONFIG_NET_TEAM is not set
@@ -2809,6 +2818,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OMAP_USB3 is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPENVSWITCH is not set
+# CONFIG_OPROFILE is not set
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 # CONFIG_ORION_WATCHDOG is not set
 # CONFIG_OSF_PARTITION is not set
@@ -2895,6 +2905,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCIEASPM is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIE_IPROC is not set
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_CNB20LE_QUIRK is not set
@@ -3980,6 +3991,7 @@ CONFIG_SQUASHFS_XZ=y
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_HOST_SOC is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
@@ -4072,6 +4084,7 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL is not set
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_HWMON is not set
+# CONFIG_THINKPAD_ACPI is not set
 # CONFIG_THRUSTMASTER_FF is not set
 # CONFIG_THUNDERBOLT is not set
 # CONFIG_TICK_CPU_ACCOUNTING is not set
@@ -4099,6 +4112,7 @@ CONFIG_TINY_RCU=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 CONFIG_TMPFS_XATTR=y
+# CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TORTURE_TEST is not set
 # CONFIG_TOSHIBA_HAPS is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
@@ -4669,6 +4683,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIRQ_DEBUG is not set
 # CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VIRTIO_PCI is not set
 # CONFIG_VIRTUALIZATION is not set