summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2014-04-10 09:38:28 -0400
committerJosh Boyer <jwboyer@redhat.com>2014-04-10 09:38:28 -0400
commit700baa35a69ec9d7b1bbd5551366a24560334451 (patch)
treee712c3f808bf1b981d84cd00f091c66c8841bb7a /config-generic
parentc8c935eaa336808a3ce4dca091675d83d62a7d1e (diff)
downloadkernel-700baa35a69ec9d7b1bbd5551366a24560334451.tar.gz
kernel-700baa35a69ec9d7b1bbd5551366a24560334451.tar.xz
kernel-700baa35a69ec9d7b1bbd5551366a24560334451.zip
Linux v3.14-12042-g69cd9eba3886
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic21
1 files changed, 19 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index e2eb3b658..e85fcf275 100644
--- a/config-generic
+++ b/config-generic
@@ -37,6 +37,7 @@ CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_COMPILE_TEST is not set
CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -293,6 +294,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_BLOCK is not set
#
# Parallel port support
@@ -318,6 +320,7 @@ CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
CONFIG_ZRAM=m
+# CONFIG_ZRAM_LZ4_COMPRESS is not set
# CONFIG_ZRAM_DEBUG is not set
CONFIG_BLK_CPQ_DA=m
@@ -638,6 +641,7 @@ CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
+# CONFIG_DM_ERA is not set
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
# CONFIG_DM_DEBUG_SPACE_MAPS is not set
CONFIG_DM_UEVENT=y
@@ -2905,6 +2909,7 @@ CONFIG_DRM_VMWGFX=m
CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
+CONFIG_DRM_PTN3460=m
#
# PCMCIA character devices
@@ -3161,8 +3166,10 @@ CONFIG_IR_JVC_DECODER=m
CONFIG_IR_SONY_DECODER=m
CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_LIRC_CODEC=m
+# CONFIG_IR_IMG is not set
CONFIG_IR_IMON=m
CONFIG_IR_MCEUSB=m
CONFIG_IR_ITE_CIR=m
@@ -3988,6 +3995,10 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_RTSX_USB is not set
+# CONFIG_MFD_TPS65218 is not set
+
#
# File systems
@@ -4153,7 +4164,8 @@ CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
+# CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set
CONFIG_SUNRPC_DEBUG=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_CIFS=m
@@ -4560,7 +4572,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_MEMCG_KMEM=y
# CONFIG_CGROUP_HUGETLB is not set
CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_NET_PRIO=m
+CONFIG_CGROUP_NET_PRIO=y
# CONFIG_CGROUP_NET_CLASSID is not set
CONFIG_BLK_CGROUP=y
@@ -4958,6 +4970,7 @@ CONFIG_RTL8192E=m
# CONFIG_R8188EU is not set
# CONFIG_R8821AE is not set
# CONFIG_RTL8192U is not set
+# CONFIG_R8723AU is not set
# CONFIG_FB_SM7XX is not set
# CONFIG_SPECTRA is not set
# CONFIG_EASYCAP is not set
@@ -4978,6 +4991,8 @@ CONFIG_R8712U=m # Larry Finger maintains this (rhbz 699618)
# CONFIG_RTS_PSTOR is not set
CONFIG_ALTERA_STAPL=m
# CONFIG_DVB_CXD2099 is not set
+# CONFIG_DVB_RTL2832_SDR is not set
+# CONFIG_PWM_FSL_FTM is not set
# CONFIG_USBIP_CORE is not set
# CONFIG_INTEL_MEI is not set
# CONFIG_ZCACHE is not set
@@ -5004,6 +5019,7 @@ CONFIG_ALTERA_STAPL=m
# CONFIG_GS_FPGABOOT is not set
# CONFIG_BT_NOKIA_H4P is not set
# CONFIG_UNISYSSPAR is not set
+# CONFIG_MEDIA_TUNER_MSI001 is not set
# END OF STAGING
#
@@ -5121,6 +5137,7 @@ CONFIG_GPIO_VIPERBOARD=m
# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_BCM_KONA is not set
# CONFIG_GPIO_SCH311X is not set
+# CONFIG_GPIO_DWAPB is not set
# FIXME: Why?
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y