From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 20 Oct 2008 16:01:56 +0000 (+0000)
Subject: Do not use dynamic ticks on rb532 (#4110)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=2ad377299c944fa98e93e55911042a5abc21bd8f

Do not use dynamic ticks on rb532 (#4110)

SVN-Revision: 13017
---

diff --git a/target/linux/rb532/config-2.6.24 b/target/linux/rb532/config-2.6.24
index 0905ed8c3f..366f655769 100644
--- a/target/linux/rb532/config-2.6.24
+++ b/target/linux/rb532/config-2.6.24
@@ -176,7 +176,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_SCH_ESFQ_NFCT is not set
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NO_HZ=y
+CONFIG_NF_CONNTRACK=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
@@ -228,7 +228,7 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
-CONFIG_TICK_ONESHOT=y
+# CONFIG_TICK_ONESHOT is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set