diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-11 15:11:34 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-11 15:11:34 -0500 |
| commit | 01bc4f68ee03f84d6cccbc5636842a3577b0c681 (patch) | |
| tree | 6834813cb2cd618ee7b0746986ef10a7c84f0ac5 /config-generic | |
| parent | d8308935db0f72734c51f6a1ec85ffa6ccffa6bc (diff) | |
| download | kernel-01bc4f68ee03f84d6cccbc5636842a3577b0c681.tar.gz kernel-01bc4f68ee03f84d6cccbc5636842a3577b0c681.tar.xz kernel-01bc4f68ee03f84d6cccbc5636842a3577b0c681.zip | |
Linux v3.19-2595-gc5ce28df0e7c
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 2caa0f0b8..db819b288 100644 --- a/config-generic +++ b/config-generic @@ -1212,6 +1212,8 @@ CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_SIMP=m CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m CONFIG_DCB=y CONFIG_DNS_RESOLVER=m @@ -1420,6 +1422,7 @@ CONFIG_IXGBEVF=m CONFIG_IXGBE=m CONFIG_IXGBE_DCA=y CONFIG_IXGBE_DCB=y +CONFIG_IXGBE_VXLAN=y CONFIG_IXGBE_HWMON=y CONFIG_I40E=m CONFIG_I40E_VXLAN=y @@ -1534,6 +1537,7 @@ CONFIG_TEHUTI=m CONFIG_NET_VENDOR_TI=y CONFIG_TLAN=m +# CONFIG_TI_CPSW_ALE is not set CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m @@ -1839,6 +1843,7 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_USB=m CONFIG_IEEE802154=m +CONFIG_IEEE802154_SOCKET=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKELB=m @@ -1963,6 +1968,7 @@ CONFIG_BT=m CONFIG_BT_BREDR=y CONFIG_BT_LE=y CONFIG_BT_6LOWPAN=m +# CONFIG_BT_SELFTEST is not set CONFIG_BT_SCO=y CONFIG_BT_CMTP=m CONFIG_BT_RFCOMM=m @@ -3676,6 +3682,7 @@ CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=y CONFIG_HID_PLANTRONICS=m CONFIG_HID_PRIMAX=m +CONFIG_HID_BETOP_FF=m CONFIG_HID_PRODIKEYS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_GYRATION=m @@ -5222,6 +5229,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_KTHREAD_PRIO=0 CONFIG_SPARSE_RCU_POINTER=y +# CONFIG_LIVEPATCH is not set + CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -5380,6 +5389,7 @@ CONFIG_POWERCAP=y # CONFIG_HMC_DRV is not set # CONFIG_PM_DEVFREQ is not set +# CONFIG_PM_DEVFREQ_EVENT is not set # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set |