[PATCH] ARM: 2795/1: update ixp2000 defconfigs

Patch from Lennert Buytenhek Update the ixp2000 defconfigs from 2.6.12-git6 to 2.6.13-rc2. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
author: Lennert Buytenhek <buytenh@wantstofly.org> 2005-07-10 14:44:54 -0400
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2005-07-10 14:44:54 -0400
commit: 4bebdab7eb11ee533ff843f4f1fec9975666e64e (patch)
tree: 2ad3ad73bfa5dfb5a04b3e7dda8860178e0ede43
parent: 28187f2ce39eb2158c35a46696af03cdfd14310a (diff)
5 files changed, 25 insertions, 75 deletions
diff --git a/arch/arm/configs/enp2611_defconfig b/arch/arm/configs/enp2611_defconfig
index b8c51ee7f1bb..f67ca01b4982 100644
--- a/arch/arm/configs/enp2611_defconfig
+++ b/arch/arm/configs/enp2611_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-git6
+# Linux kernel version: 2.6.13-rc2
-# Sat Jun 25 00:57:29 2005
+# Thu Jul  7 16:41:21 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -137,6 +137,7 @@ CONFIG_PCI_NAMES=y
 #
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -345,10 +346,9 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -363,17 +363,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
-#
-# TCP congestion control
-#
 CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -931,4 +922,3 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2400_defconfig b/arch/arm/configs/ixdp2400_defconfig
index 3cfbe2ec29ca..5c6c928215d0 100644
--- a/arch/arm/configs/ixdp2400_defconfig
+++ b/arch/arm/configs/ixdp2400_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-git6
+# Linux kernel version: 2.6.13-rc2
-# Sat Jun 25 00:58:38 2005
+# Thu Jul  7 16:49:01 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
 #
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
-#
-# TCP congestion control
-#
 CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -932,4 +923,3 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2401_defconfig b/arch/arm/configs/ixdp2401_defconfig
index 5c87e8e6969b..6dc40f6be0ef 100644
--- a/arch/arm/configs/ixdp2401_defconfig
+++ b/arch/arm/configs/ixdp2401_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-git6
+# Linux kernel version: 2.6.13-rc2
-# Sat Jun 25 00:59:35 2005
+# Thu Jul  7 16:49:08 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
 #
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_IP_TCPDIAG=y
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
-#
-# TCP congestion control
-#
 CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -933,4 +924,3 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2800_defconfig b/arch/arm/configs/ixdp2800_defconfig
index 3cb561a551cb..d2bb0b7153fe 100644
--- a/arch/arm/configs/ixdp2800_defconfig
+++ b/arch/arm/configs/ixdp2800_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-git6
+# Linux kernel version: 2.6.13-rc2
-# Sat Jun 25 01:00:27 2005
+# Thu Jul  7 16:49:20 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
 #
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
-#
-# TCP congestion control
-#
 CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -932,4 +923,3 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2801_defconfig b/arch/arm/configs/ixdp2801_defconfig
index b1e162f29cb9..2d6f960e3395 100644
--- a/arch/arm/configs/ixdp2801_defconfig
+++ b/arch/arm/configs/ixdp2801_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-git6
+# Linux kernel version: 2.6.13-rc2
-# Sat Jun 25 01:01:18 2005
+# Thu Jul  7 16:49:13 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
 #
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
-#
-# TCP congestion control
-#
 CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -933,4 +924,3 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_TEXTSEARCH is not set
author	Lennert Buytenhek <buytenh@wantstofly.org>	2005-07-10 14:44:54 -0400
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2005-07-10 14:44:54 -0400
commit	4bebdab7eb11ee533ff843f4f1fec9975666e64e (patch)
tree	2ad3ad73bfa5dfb5a04b3e7dda8860178e0ede43
parent	28187f2ce39eb2158c35a46696af03cdfd14310a (diff)

diff --git a/arch/arm/configs/enp2611_defconfig b/arch/arm/configs/enp2611_defconfig index b8c51ee7f1bb..f67ca01b4982 100644 --- a/arch/arm/configs/enp2611_defconfig +++ b/arch/arm/configs/enp2611_defconfig
@@ -1,7 +1,7 @@
1	#	1	#
2	# Automatically generated make config: don't edit	2	# Automatically generated make config: don't edit
3	# Linux kernel version: 2.6.12-git6	3	# Linux kernel version: 2.6.13-rc2
4	# Sat Jun 25 00:57:29 2005	4	# Thu Jul 7 16:41:21 2005
5	#	5	#
6	CONFIG_ARM=y	6	CONFIG_ARM=y
7	CONFIG_MMU=y	7	CONFIG_MMU=y
@@ -137,6 +137,7 @@ CONFIG_PCI_NAMES=y
137	#	137	#
138	# CONFIG_SMP is not set	138	# CONFIG_SMP is not set
139	# CONFIG_PREEMPT is not set	139	# CONFIG_PREEMPT is not set
		140	# CONFIG_NO_IDLE_HZ is not set
140	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set	141	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
141	CONFIG_SELECT_MEMORY_MODEL=y	142	CONFIG_SELECT_MEMORY_MODEL=y
142	CONFIG_FLATMEM_MANUAL=y	143	CONFIG_FLATMEM_MANUAL=y
@@ -345,10 +346,9 @@ CONFIG_PACKET_MMAP=y
345	CONFIG_UNIX=y	346	CONFIG_UNIX=y
346	# CONFIG_NET_KEY is not set	347	# CONFIG_NET_KEY is not set
347	CONFIG_INET=y	348	CONFIG_INET=y
348	CONFIG_IP_FIB_HASH=y
349	# CONFIG_IP_FIB_TRIE is not set
350	# CONFIG_IP_MULTICAST is not set	349	# CONFIG_IP_MULTICAST is not set
351	# CONFIG_IP_ADVANCED_ROUTER is not set	350	# CONFIG_IP_ADVANCED_ROUTER is not set
		351	CONFIG_IP_FIB_HASH=y
352	CONFIG_IP_PNP=y	352	CONFIG_IP_PNP=y
353	CONFIG_IP_PNP_DHCP=y	353	CONFIG_IP_PNP_DHCP=y
354	CONFIG_IP_PNP_BOOTP=y	354	CONFIG_IP_PNP_BOOTP=y
@@ -363,17 +363,8 @@ CONFIG_SYN_COOKIES=y
363	# CONFIG_INET_TUNNEL is not set	363	# CONFIG_INET_TUNNEL is not set
364	# CONFIG_IP_TCPDIAG is not set	364	# CONFIG_IP_TCPDIAG is not set
365	# CONFIG_IP_TCPDIAG_IPV6 is not set	365	# CONFIG_IP_TCPDIAG_IPV6 is not set
366		366	# CONFIG_TCP_CONG_ADVANCED is not set
367	#
368	# TCP congestion control
369	#
370	CONFIG_TCP_CONG_BIC=y	367	CONFIG_TCP_CONG_BIC=y
371	CONFIG_TCP_CONG_WESTWOOD=m
372	CONFIG_TCP_CONG_HTCP=m
373	# CONFIG_TCP_CONG_HSTCP is not set
374	# CONFIG_TCP_CONG_HYBLA is not set
375	# CONFIG_TCP_CONG_VEGAS is not set
376	# CONFIG_TCP_CONG_SCALABLE is not set
377	# CONFIG_IPV6 is not set	368	# CONFIG_IPV6 is not set
378	# CONFIG_NETFILTER is not set	369	# CONFIG_NETFILTER is not set
379		370
@@ -931,4 +922,3 @@ CONFIG_CRC32=y
931	# CONFIG_LIBCRC32C is not set	922	# CONFIG_LIBCRC32C is not set
932	CONFIG_ZLIB_INFLATE=y	923	CONFIG_ZLIB_INFLATE=y
933	CONFIG_ZLIB_DEFLATE=y	924	CONFIG_ZLIB_DEFLATE=y
934	# CONFIG_TEXTSEARCH is not set


diff --git a/arch/arm/configs/ixdp2400_defconfig b/arch/arm/configs/ixdp2400_defconfig index 3cfbe2ec29ca..5c6c928215d0 100644 --- a/arch/arm/configs/ixdp2400_defconfig +++ b/arch/arm/configs/ixdp2400_defconfig
@@ -1,7 +1,7 @@
1	#	1	#
2	# Automatically generated make config: don't edit	2	# Automatically generated make config: don't edit
3	# Linux kernel version: 2.6.12-git6	3	# Linux kernel version: 2.6.13-rc2
4	# Sat Jun 25 00:58:38 2005	4	# Thu Jul 7 16:49:01 2005
5	#	5	#
6	CONFIG_ARM=y	6	CONFIG_ARM=y
7	CONFIG_MMU=y	7	CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
138	#	138	#
139	# CONFIG_SMP is not set	139	# CONFIG_SMP is not set
140	# CONFIG_PREEMPT is not set	140	# CONFIG_PREEMPT is not set
		141	# CONFIG_NO_IDLE_HZ is not set
141	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set	142	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
142	CONFIG_SELECT_MEMORY_MODEL=y	143	CONFIG_SELECT_MEMORY_MODEL=y
143	CONFIG_FLATMEM_MANUAL=y	144	CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
346	CONFIG_UNIX=y	347	CONFIG_UNIX=y
347	# CONFIG_NET_KEY is not set	348	# CONFIG_NET_KEY is not set
348	CONFIG_INET=y	349	CONFIG_INET=y
349	CONFIG_IP_FIB_HASH=y
350	# CONFIG_IP_FIB_TRIE is not set
351	# CONFIG_IP_MULTICAST is not set	350	# CONFIG_IP_MULTICAST is not set
352	# CONFIG_IP_ADVANCED_ROUTER is not set	351	# CONFIG_IP_ADVANCED_ROUTER is not set
		352	CONFIG_IP_FIB_HASH=y
353	CONFIG_IP_PNP=y	353	CONFIG_IP_PNP=y
354	CONFIG_IP_PNP_DHCP=y	354	CONFIG_IP_PNP_DHCP=y
355	CONFIG_IP_PNP_BOOTP=y	355	CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
364	# CONFIG_INET_TUNNEL is not set	364	# CONFIG_INET_TUNNEL is not set
365	# CONFIG_IP_TCPDIAG is not set	365	# CONFIG_IP_TCPDIAG is not set
366	# CONFIG_IP_TCPDIAG_IPV6 is not set	366	# CONFIG_IP_TCPDIAG_IPV6 is not set
367		367	# CONFIG_TCP_CONG_ADVANCED is not set
368	#
369	# TCP congestion control
370	#
371	CONFIG_TCP_CONG_BIC=y	368	CONFIG_TCP_CONG_BIC=y
372	CONFIG_TCP_CONG_WESTWOOD=m
373	CONFIG_TCP_CONG_HTCP=m
374	# CONFIG_TCP_CONG_HSTCP is not set
375	# CONFIG_TCP_CONG_HYBLA is not set
376	# CONFIG_TCP_CONG_VEGAS is not set
377	# CONFIG_TCP_CONG_SCALABLE is not set
378	# CONFIG_IPV6 is not set	369	# CONFIG_IPV6 is not set
379	# CONFIG_NETFILTER is not set	370	# CONFIG_NETFILTER is not set
380		371
@@ -932,4 +923,3 @@ CONFIG_CRC32=y
932	# CONFIG_LIBCRC32C is not set	923	# CONFIG_LIBCRC32C is not set
933	CONFIG_ZLIB_INFLATE=y	924	CONFIG_ZLIB_INFLATE=y
934	CONFIG_ZLIB_DEFLATE=y	925	CONFIG_ZLIB_DEFLATE=y
935	# CONFIG_TEXTSEARCH is not set


diff --git a/arch/arm/configs/ixdp2401_defconfig b/arch/arm/configs/ixdp2401_defconfig index 5c87e8e6969b..6dc40f6be0ef 100644 --- a/arch/arm/configs/ixdp2401_defconfig +++ b/arch/arm/configs/ixdp2401_defconfig
@@ -1,7 +1,7 @@
1	#	1	#
2	# Automatically generated make config: don't edit	2	# Automatically generated make config: don't edit
3	# Linux kernel version: 2.6.12-git6	3	# Linux kernel version: 2.6.13-rc2
4	# Sat Jun 25 00:59:35 2005	4	# Thu Jul 7 16:49:08 2005
5	#	5	#
6	CONFIG_ARM=y	6	CONFIG_ARM=y
7	CONFIG_MMU=y	7	CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
138	#	138	#
139	# CONFIG_SMP is not set	139	# CONFIG_SMP is not set
140	# CONFIG_PREEMPT is not set	140	# CONFIG_PREEMPT is not set
		141	# CONFIG_NO_IDLE_HZ is not set
141	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set	142	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
142	CONFIG_SELECT_MEMORY_MODEL=y	143	CONFIG_SELECT_MEMORY_MODEL=y
143	CONFIG_FLATMEM_MANUAL=y	144	CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
346	CONFIG_UNIX=y	347	CONFIG_UNIX=y
347	# CONFIG_NET_KEY is not set	348	# CONFIG_NET_KEY is not set
348	CONFIG_INET=y	349	CONFIG_INET=y
349	CONFIG_IP_FIB_HASH=y
350	# CONFIG_IP_FIB_TRIE is not set
351	# CONFIG_IP_MULTICAST is not set	350	# CONFIG_IP_MULTICAST is not set
352	# CONFIG_IP_ADVANCED_ROUTER is not set	351	# CONFIG_IP_ADVANCED_ROUTER is not set
		352	CONFIG_IP_FIB_HASH=y
353	CONFIG_IP_PNP=y	353	CONFIG_IP_PNP=y
354	CONFIG_IP_PNP_DHCP=y	354	CONFIG_IP_PNP_DHCP=y
355	CONFIG_IP_PNP_BOOTP=y	355	CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
364	# CONFIG_INET_TUNNEL is not set	364	# CONFIG_INET_TUNNEL is not set
365	CONFIG_IP_TCPDIAG=y	365	CONFIG_IP_TCPDIAG=y
366	# CONFIG_IP_TCPDIAG_IPV6 is not set	366	# CONFIG_IP_TCPDIAG_IPV6 is not set
367		367	# CONFIG_TCP_CONG_ADVANCED is not set
368	#
369	# TCP congestion control
370	#
371	CONFIG_TCP_CONG_BIC=y	368	CONFIG_TCP_CONG_BIC=y
372	CONFIG_TCP_CONG_WESTWOOD=m
373	CONFIG_TCP_CONG_HTCP=m
374	# CONFIG_TCP_CONG_HSTCP is not set
375	# CONFIG_TCP_CONG_HYBLA is not set
376	# CONFIG_TCP_CONG_VEGAS is not set
377	# CONFIG_TCP_CONG_SCALABLE is not set
378	# CONFIG_IPV6 is not set	369	# CONFIG_IPV6 is not set
379	# CONFIG_NETFILTER is not set	370	# CONFIG_NETFILTER is not set
380		371
@@ -933,4 +924,3 @@ CONFIG_CRC32=y
933	# CONFIG_LIBCRC32C is not set	924	# CONFIG_LIBCRC32C is not set
934	CONFIG_ZLIB_INFLATE=y	925	CONFIG_ZLIB_INFLATE=y
935	CONFIG_ZLIB_DEFLATE=y	926	CONFIG_ZLIB_DEFLATE=y
936	# CONFIG_TEXTSEARCH is not set


diff --git a/arch/arm/configs/ixdp2800_defconfig b/arch/arm/configs/ixdp2800_defconfig index 3cb561a551cb..d2bb0b7153fe 100644 --- a/arch/arm/configs/ixdp2800_defconfig +++ b/arch/arm/configs/ixdp2800_defconfig
@@ -1,7 +1,7 @@
1	#	1	#
2	# Automatically generated make config: don't edit	2	# Automatically generated make config: don't edit
3	# Linux kernel version: 2.6.12-git6	3	# Linux kernel version: 2.6.13-rc2
4	# Sat Jun 25 01:00:27 2005	4	# Thu Jul 7 16:49:20 2005
5	#	5	#
6	CONFIG_ARM=y	6	CONFIG_ARM=y
7	CONFIG_MMU=y	7	CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
138	#	138	#
139	# CONFIG_SMP is not set	139	# CONFIG_SMP is not set
140	# CONFIG_PREEMPT is not set	140	# CONFIG_PREEMPT is not set
		141	# CONFIG_NO_IDLE_HZ is not set
141	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set	142	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
142	CONFIG_SELECT_MEMORY_MODEL=y	143	CONFIG_SELECT_MEMORY_MODEL=y
143	CONFIG_FLATMEM_MANUAL=y	144	CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
346	CONFIG_UNIX=y	347	CONFIG_UNIX=y
347	# CONFIG_NET_KEY is not set	348	# CONFIG_NET_KEY is not set
348	CONFIG_INET=y	349	CONFIG_INET=y
349	CONFIG_IP_FIB_HASH=y
350	# CONFIG_IP_FIB_TRIE is not set
351	# CONFIG_IP_MULTICAST is not set	350	# CONFIG_IP_MULTICAST is not set
352	# CONFIG_IP_ADVANCED_ROUTER is not set	351	# CONFIG_IP_ADVANCED_ROUTER is not set
		352	CONFIG_IP_FIB_HASH=y
353	CONFIG_IP_PNP=y	353	CONFIG_IP_PNP=y
354	CONFIG_IP_PNP_DHCP=y	354	CONFIG_IP_PNP_DHCP=y
355	CONFIG_IP_PNP_BOOTP=y	355	CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
364	# CONFIG_INET_TUNNEL is not set	364	# CONFIG_INET_TUNNEL is not set
365	# CONFIG_IP_TCPDIAG is not set	365	# CONFIG_IP_TCPDIAG is not set
366	# CONFIG_IP_TCPDIAG_IPV6 is not set	366	# CONFIG_IP_TCPDIAG_IPV6 is not set
367		367	# CONFIG_TCP_CONG_ADVANCED is not set
368	#
369	# TCP congestion control
370	#
371	CONFIG_TCP_CONG_BIC=y	368	CONFIG_TCP_CONG_BIC=y
372	CONFIG_TCP_CONG_WESTWOOD=m
373	CONFIG_TCP_CONG_HTCP=m
374	# CONFIG_TCP_CONG_HSTCP is not set
375	# CONFIG_TCP_CONG_HYBLA is not set
376	# CONFIG_TCP_CONG_VEGAS is not set
377	# CONFIG_TCP_CONG_SCALABLE is not set
378	# CONFIG_IPV6 is not set	369	# CONFIG_IPV6 is not set
379	# CONFIG_NETFILTER is not set	370	# CONFIG_NETFILTER is not set
380		371
@@ -932,4 +923,3 @@ CONFIG_CRC32=y
932	# CONFIG_LIBCRC32C is not set	923	# CONFIG_LIBCRC32C is not set
933	CONFIG_ZLIB_INFLATE=y	924	CONFIG_ZLIB_INFLATE=y
934	CONFIG_ZLIB_DEFLATE=y	925	CONFIG_ZLIB_DEFLATE=y
935	# CONFIG_TEXTSEARCH is not set


diff --git a/arch/arm/configs/ixdp2801_defconfig b/arch/arm/configs/ixdp2801_defconfig index b1e162f29cb9..2d6f960e3395 100644 --- a/arch/arm/configs/ixdp2801_defconfig +++ b/arch/arm/configs/ixdp2801_defconfig
@@ -1,7 +1,7 @@
1	#	1	#
2	# Automatically generated make config: don't edit	2	# Automatically generated make config: don't edit
3	# Linux kernel version: 2.6.12-git6	3	# Linux kernel version: 2.6.13-rc2
4	# Sat Jun 25 01:01:18 2005	4	# Thu Jul 7 16:49:13 2005
5	#	5	#
6	CONFIG_ARM=y	6	CONFIG_ARM=y
7	CONFIG_MMU=y	7	CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y
138	#	138	#
139	# CONFIG_SMP is not set	139	# CONFIG_SMP is not set
140	# CONFIG_PREEMPT is not set	140	# CONFIG_PREEMPT is not set
		141	# CONFIG_NO_IDLE_HZ is not set
141	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set	142	# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
142	CONFIG_SELECT_MEMORY_MODEL=y	143	CONFIG_SELECT_MEMORY_MODEL=y
143	CONFIG_FLATMEM_MANUAL=y	144	CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y
346	CONFIG_UNIX=y	347	CONFIG_UNIX=y
347	# CONFIG_NET_KEY is not set	348	# CONFIG_NET_KEY is not set
348	CONFIG_INET=y	349	CONFIG_INET=y
349	CONFIG_IP_FIB_HASH=y
350	# CONFIG_IP_FIB_TRIE is not set
351	# CONFIG_IP_MULTICAST is not set	350	# CONFIG_IP_MULTICAST is not set
352	# CONFIG_IP_ADVANCED_ROUTER is not set	351	# CONFIG_IP_ADVANCED_ROUTER is not set
		352	CONFIG_IP_FIB_HASH=y
353	CONFIG_IP_PNP=y	353	CONFIG_IP_PNP=y
354	CONFIG_IP_PNP_DHCP=y	354	CONFIG_IP_PNP_DHCP=y
355	CONFIG_IP_PNP_BOOTP=y	355	CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y
364	# CONFIG_INET_TUNNEL is not set	364	# CONFIG_INET_TUNNEL is not set
365	# CONFIG_IP_TCPDIAG is not set	365	# CONFIG_IP_TCPDIAG is not set
366	# CONFIG_IP_TCPDIAG_IPV6 is not set	366	# CONFIG_IP_TCPDIAG_IPV6 is not set
367		367	# CONFIG_TCP_CONG_ADVANCED is not set
368	#
369	# TCP congestion control
370	#
371	CONFIG_TCP_CONG_BIC=y	368	CONFIG_TCP_CONG_BIC=y
372	CONFIG_TCP_CONG_WESTWOOD=m
373	CONFIG_TCP_CONG_HTCP=m
374	# CONFIG_TCP_CONG_HSTCP is not set
375	# CONFIG_TCP_CONG_HYBLA is not set
376	# CONFIG_TCP_CONG_VEGAS is not set
377	# CONFIG_TCP_CONG_SCALABLE is not set
378	# CONFIG_IPV6 is not set	369	# CONFIG_IPV6 is not set
379	# CONFIG_NETFILTER is not set	370	# CONFIG_NETFILTER is not set
380		371
@@ -933,4 +924,3 @@ CONFIG_CRC32=y
933	# CONFIG_LIBCRC32C is not set	924	# CONFIG_LIBCRC32C is not set
934	CONFIG_ZLIB_INFLATE=y	925	CONFIG_ZLIB_INFLATE=y
935	CONFIG_ZLIB_DEFLATE=y	926	CONFIG_ZLIB_DEFLATE=y
936	# CONFIG_TEXTSEARCH is not set