linux: move CONFIG_BOOKE_WDT to the generic config

[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 06eeb90bc22568ee81906bab5878e8d7442ee0b7..244e7988e7d3ca17418daa8adf7f9ea443772921 100644 (file)
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -14,6 +14,7 @@ CONFIG_32BIT=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_HED is not set
 # CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADFS_FS is not set
@@ -123,6 +124,7 @@ CONFIG_ATA_SFF=y
 # CONFIG_ATA_VERBOSE_ERROR is not set
 # CONFIG_ATH5K is not set
 # CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
 # CONFIG_ATH9K is not set
 # CONFIG_ATL1 is not set
 # CONFIG_ATL1C is not set
@@ -152,6 +154,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
@@ -277,6 +280,7 @@ CONFIG_BLOCK=y
 # CONFIG_BNX2 is not set
 # CONFIG_BNX2X is not set
 # CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOOT_RAW=y
 # CONFIG_BPQETHER is not set
@@ -505,6 +509,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
@@ -606,6 +612,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
@@ -624,6 +631,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
@@ -733,6 +741,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
 CONFIG_FRAME_WARN=1024
 # CONFIG_FREEZER is not set
 # CONFIG_FRONTSWAP is not set
@@ -1260,12 +1269,14 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
 # 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
@@ -1280,6 +1291,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_L2TP_IP is not set
 # CONFIG_L2TP_V3 is not set
 # CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
@@ -1704,6 +1716,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
 # CONFIG_NET_CALXEDA_XGMAC is not set
 CONFIG_NET_CLS=y
 # CONFIG_NET_CLS_ACT is not set
@@ -1846,7 +1859,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
@@ -2533,6 +2546,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
@@ -3109,6 +3123,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