Skip to content
Browse files

Merge branch 'configs-3.1' into pf-3.1

  • Loading branch information...
2 parents 282cf29 + bb708d4 commit fc6c476da566fe8d24fd8a9d5095c3130132a87a Oleksandr Natalenko committed
Showing with 8 additions and 1 deletion.
  1. +8 −1 configs/dell-inspiron-1525.config
View
9 configs/dell-inspiron-1525.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.1-pf Kernel Configuration
+# Linux/i386 3.1.3-pf Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -721,6 +721,7 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_IMQ=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -1305,6 +1306,12 @@ CONFIG_NETDEVICES=y
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
+CONFIG_IMQ=m
+# CONFIG_IMQ_BEHAVIOR_AA is not set
+CONFIG_IMQ_BEHAVIOR_AB=y
+# CONFIG_IMQ_BEHAVIOR_BA is not set
+# CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IMQ_NUM_DEVS=16
CONFIG_TUN=m
CONFIG_VETH=m
# CONFIG_NET_SB1000 is not set

0 comments on commit fc6c476

Please sign in to comment.
Something went wrong with that request. Please try again.