kernel: remove the cisco SIP NAT patch, at least on 3.6 it crashes

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

diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
index aee940f33a913ac627d977066d2a99a889e5c4fd..6d417ad5e3864059e729c7070ddf62f098b2b1ee 100644 (file)
--- a/target/linux/generic/config-3.6
+++ b/target/linux/generic/config-3.6
@@ -296,6 +296,7 @@ CONFIG_BLOCK=y
 # CONFIG_BNX2X is not set
 # CONFIG_BONDING is not set
 # CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOOT_RAW=y
 # CONFIG_BPF_JIT is not set
@@ -607,6 +608,7 @@ CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DEVTMPFS is not set
 # CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DIRECT_IO is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DL2K is not set
@@ -670,6 +672,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_ENIC is not set
+# CONFIG_EPAPR_PARAVIRT is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
@@ -843,6 +846,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_RDC321X is not set
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_SX150X is not set
@@ -1459,6 +1463,7 @@ CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_MD is not set
 # CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MD_FAULTY is not set
 # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
 # CONFIG_MEDIA_ATTACH is not set
@@ -2145,6 +2150,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_NINJA32 is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OF_PLATFORM is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
@@ -2234,8 +2240,10 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_RUNTIME is not set
+# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_POHMELFS is not set
@@ -2278,6 +2286,7 @@ CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 # CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_STRIPPED=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -2861,6 +2870,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PCXHR is not set
 # CONFIG_SND_PDAUDIOCF is not set
 # CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_POWERPC_SOC is not set
 # CONFIG_SND_PPC is not set
 # CONFIG_SND_RAWMIDI is not set
 # CONFIG_SND_RIPTIDE is not set
@@ -3419,7 +3429,9 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
 # CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_AK881X is not set
 # CONFIG_VIDEO_BT819 is not set
@@ -3490,6 +3502,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_VP27SMPX is not set
 # CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_WM8775 is not set
 # CONFIG_VIDEO_ZORAN is not set
@@ -3574,6 +3587,7 @@ CONFIG_XFRM=y
 # CONFIG_XFS_POSIX_ACL is not set
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_RT is not set
+# CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_XILINX_EMACLITE is not set
 # CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_XIP_KERNEL is not set