X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-3.18;h=c2fedc53a8c7d8dc2dcce72fecb4b758fb877552;hb=cbb40a6687d55265e21cd9158b215facb0e819bc;hp=e0202b788dafd7f8104c39fe5dbec11eb7ab6b3d;hpb=54d13dab12896992de441210d24123cf6fa6649d;p=openwrt.git

diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index e0202b788d..c2fedc53a8 100644
--- 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
@@ -340,6 +341,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
@@ -700,9 +702,10 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
+CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -731,6 +734,7 @@ CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 # CONFIG_CRYPTO_DEV_TALITOS is not set
 # CONFIG_CRYPTO_DRBG_MENU is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set
@@ -925,6 +929,8 @@ CONFIG_DQL=y
 # CONFIG_DS1682 is not set
 # CONFIG_DTLK is not set
 # CONFIG_DUMMY is not set
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_DVB_AU8522_V4L is not set
 # CONFIG_DVB_CORE is not set
@@ -1045,6 +1051,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
@@ -2262,6 +2269,8 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
+# CONFIG_MTD_SPLIT_EVA_FW is not set
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_FIT_FW is not set
@@ -2485,6 +2494,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_TCPPROBE is not set
 # CONFIG_NET_TEAM is not set
 # CONFIG_NET_TULIP is not set
@@ -2715,6 +2725,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
@@ -3009,6 +3020,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_REDWOOD is not set
 # CONFIG_REGMAP is not set
 # CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_MMIO is not set
 # CONFIG_REGMAP_SPI is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_ACT8865 is not set