projects / pve-kernel-3.10.0.git / blame
| Commit | Line | Data |
|---|---|---|
| e857e197 DM |
1 | --- rh-kernel-src/kernel-3.10.0-x86_64.config 2013-12-16 08:05:07.513206660 +0100 |
| 2 | +++ config-3.10.0 2013-12-17 09:46:34.343121619 +0100 | |
| 3 | @@ -1125,7 +1125,7 @@ | |
| 4 | CONFIG_STP=m | |
| 5 | CONFIG_GARP=m | |
| 6 | CONFIG_MRP=m | |
| 7 | -CONFIG_BRIDGE=m | |
| 8 | +CONFIG_BRIDGE=y | |
| 9 | CONFIG_BRIDGE_IGMP_SNOOPING=y | |
| 10 | CONFIG_BRIDGE_VLAN_FILTERING=y | |
| 11 | CONFIG_HAVE_NET_DSA=y | |
| 12 | @@ -1431,7 +1431,8 @@ | |
| 9ed71929 DM |
13 | CONFIG_BLK_DEV_LOOP=m |
| 14 | CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 | |
| 15 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | |
| 16 | -# CONFIG_BLK_DEV_DRBD is not set | |
| 17 | +CONFIG_BLK_DEV_DRBD=m | |
| 18 | +# CONFIG_DRBD_FAULT_INJECTION is not set | |
| 19 | # CONFIG_BLK_DEV_NBD is not set | |
| 20 | CONFIG_BLK_DEV_NVME=m | |
| 21 | CONFIG_BLK_DEV_OSD=m | |
| e857e197 | 22 | @@ -5208,6 +5209,7 @@ |
| 9ed71929 DM |
23 | CONFIG_DQL=y |
| 24 | CONFIG_NLATTR=y | |
| 25 | CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y | |
| 26 | +CONFIG_LRU_CACHE=m | |
| 27 | CONFIG_AVERAGE=y | |
| 28 | CONFIG_CLZ_TAB=y | |
| 29 | CONFIG_CORDIC=m |