kernel: update linux 3.3 to 3.3.3

[oweals/openwrt.git] / target / linux / generic / config-3.3

diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index fca2eece8d40b513808754888362e68e088431e4..e66304236d0c909aa72b5f615dfd8431702b2bb0 100644 (file)
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -153,6 +153,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_TCP is not set
 # CONFIG_ATM_ZATM is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
 # CONFIG_AUDIT is not set
 # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -506,6 +507,8 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CXT1E1 is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
@@ -607,6 +610,7 @@ CONFIG_DQL=y
 # CONFIG_EASYCAP is not set
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
 # CONFIG_EDAC is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -625,6 +629,7 @@ CONFIG_EMBEDDED=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
@@ -1269,6 +1274,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_KGDB is not set
 # CONFIG_KMEMCHECK is not set
 # CONFIG_KPROBES is not set
@@ -1851,7 +1857,7 @@ CONFIG_NFS_V3=y
 # CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
-# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
@@ -2538,6 +2544,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIO is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SFC is not set
 # CONFIG_SFI is not set
@@ -3114,6 +3121,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
 # CONFIG_USB_SERIAL_MOS7720 is not set
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_MOTOROLA is not set