[ar71xx] don't override CONFIG_NF_CT_ACCT

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13756 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27
index 5cb344d..830a837 100644 (file)
--- a/target/linux/ar71xx/config-2.6.27
+++ b/target/linux/ar71xx/config-2.6.27
@@ -168,7 +168,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set

-CONFIG_NF_CT_ACCT=y

 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set

diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index 17eafa1..b0984dd 100644 (file)
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -177,7 +177,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MYLOADER=y
 # CONFIG_NATSEMI is not set

-CONFIG_NF_CT_ACCT=y

 CONFIG_NF_DEFRAG_IPV4=m
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 CONFIG_NF_DEFRAG_IPV4=m
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set