summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-01-31 08:38:20 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-01-31 09:28:30 -0500
commitbe304f4743cfe7d58c3b0e12bd3e4c89229d203d (patch)
tree7c2ba4a26a6a3649c28e023f852d3864d004011d /config-generic
parent791339b2e803fb3d56c5e6957bfa7da562cbcff0 (diff)
downloadkernel-be304f4743cfe7d58c3b0e12bd3e4c89229d203d.tar.gz
kernel-be304f4743cfe7d58c3b0e12bd3e4c89229d203d.tar.xz
kernel-be304f4743cfe7d58c3b0e12bd3e4c89229d203d.zip
Linux v3.13-10637-ge7651b8
- Enable ZRAM/ZSMALLOC (rhbz 1058072) - Turn EXYNOS_HDMI back on now that it should build
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic6
1 files changed, 4 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 809b4832c..2f24255a3 100644
--- a/config-generic
+++ b/config-generic
@@ -315,6 +315,8 @@ CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
@@ -4908,7 +4910,6 @@ CONFIG_RTL8192E=m
# CONFIG_RTL8192U is not set
# CONFIG_FB_SM7XX is not set
# CONFIG_SPECTRA is not set
-# CONFIG_ZRAM is not set
# CONFIG_EASYCAP is not set
# CONFIG_SOLO6X10 is not set
# CONFIG_ACPI_QUICKSTART is not set
@@ -4933,7 +4934,6 @@ CONFIG_ALTERA_STAPL=m
# CONFIG_RTS5139 is not set
# CONFIG_NVEC_LEDS is not set
# CONFIG_VT6655 is not set
-# CONFIG_ZSMALLOC is not set
# CONFIG_RAMSTER is not set
# CONFIG_USB_WPAN_HCD is not set
# CONFIG_WIMAX_GDM72XX is not set
@@ -5026,6 +5026,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_KEYBOARD_GPIO is not set