[kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

[openwrt.git] / target / linux / generic / config-3.0

diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index d0a40a1..7179914 100644 (file)
--- a/target/linux/generic/config-3.0
+++ b/target/linux/generic/config-3.0
@@ -99,6 +99,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_UNWIND is not set
 CONFIG_ARPD=y
 # CONFIG_ARTHUR is not set
@@ -374,7 +375,9 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 # CONFIG_CNIC is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
@@ -526,6 +529,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_DECNET is not set
 CONFIG_DECOMPRESS_LZMA_NEEDED=y
 CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -698,6 +702,7 @@ CONFIG_FSNOTIFY=y
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FT1000 is not set
 # CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
 # CONFIG_FTRACE is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
@@ -1330,6 +1335,7 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MC13783 is not set
 # CONFIG_MFD_MC13XXX is not set
@@ -1345,6 +1351,7 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_WM831X is not set
 # CONFIG_MFD_WM831X_I2C is not set
@@ -1462,6 +1469,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
 # CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
@@ -1988,6 +1996,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RC_CORE is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_RCU_FAST_NO_HZ is not set
@@ -2698,6 +2707,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_ADUTUX is not set
@@ -2817,6 +2827,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
 # CONFIG_USB_NET_MCS7830 is not set
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_PLUSB is not set