diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-08-01 08:13:43 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-08-01 08:13:43 -0400 |
commit | da4313c6b3c4c63ac564220d49c66b57d4438962 (patch) | |
tree | c30196a3eb5eff5076600378e27096f1c3c23f33 /config-generic | |
parent | c669bee7dfe2e6fa31ca6df4d2310541ff86052d (diff) | |
download | kernel-da4313c6b3c4c63ac564220d49c66b57d4438962.tar.gz kernel-da4313c6b3c4c63ac564220d49c66b57d4438962.tar.xz kernel-da4313c6b3c4c63ac564220d49c66b57d4438962.zip |
Linux v3.5-8833-g2d53492
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/config-generic b/config-generic index 80ada65a0..3ac2ba90a 100644 --- a/config-generic +++ b/config-generic @@ -1020,6 +1020,10 @@ CONFIG_NET_ACT_SIMP=m CONFIG_NET_ACT_SKBEDIT=m CONFIG_DCB=y +CONFIG_DNS_RESOLVER=m +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BLA=y +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_NETPRIO_CGROUP=m @@ -2440,6 +2444,11 @@ CONFIG_HANGCHECK_TIMER=m # Multimedia devices # CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_ADV_DEBUG is not set @@ -2527,6 +2536,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # Radio Adapters # CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m CONFIG_RADIO_WL1273=m # CONFIG_RADIO_WL128X is not set # depends on TI_ST which we don't enable @@ -2636,8 +2647,11 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_RC_CORE=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m +CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m @@ -2657,6 +2671,7 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_ENE=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m CONFIG_IR_GPIO_CIR=m CONFIG_V4L_MEM2MEM_DRIVERS=y @@ -3529,6 +3544,7 @@ CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y +# CONFIG_NFS_SWAP is not set CONFIG_NFS_V4_1=y CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFSD=m @@ -3690,6 +3706,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_DRIVER is not set CONFIG_HEADERS_CHECK=y # CONFIG_LKDTM is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_READABLE_ASM is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -3729,6 +3746,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_BACKTRACE_SELF_TEST is not set CONFIG_LATENCYTOP=y CONFIG_RESOURCE_COUNTERS=y +# CONFIG_MEMCG is not set # CONFIG_COMPAT_BRK is not set # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set @@ -3912,6 +3930,7 @@ CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount' # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +# CONFIG_CGROUP_HUGETLB is not set CONFIG_CGROUP_PERF=y CONFIG_BLK_CGROUP=y @@ -4118,6 +4137,7 @@ CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m # CONFIG_UIO_NETX is not set +# CONFIG_VFIO is not set # LIRC @@ -4240,7 +4260,6 @@ CONFIG_USB_ATMEL=m # CONFIG_VIDEO_CX25821 is not set # CONFIG_R8187SE is not set # CONFIG_RTL8192U is not set -CONFIG_BATMAN_ADV=m # CONFIG_FB_SM7XX is not set # CONFIG_SPECTRA is not set # CONFIG_ZRAM is not set @@ -4365,7 +4384,7 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_AMD8111 is not set - +# CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_SX150X is not set # FIXME: Why? |