aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-20 04:27:08 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-20 04:27:08 -0400
commit4c5eb38af2131d867842cdd09fa83a3ed77bfd26 (patch)
treebc46864eb3ac479bb4ea1cb454dd077dea759a81
parentc8bfcd95def89cb69a04c58e1de7995d696c8760 (diff)
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/defconfig29
1 files changed, 27 insertions, 2 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index f09a70b8aabd..9da75f89fe2c 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/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.17-rc3 3# Linux kernel version: 2.6.17
4# Fri May 12 12:43:49 2006 4# Tue Jun 20 01:26:43 2006
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -87,6 +87,7 @@ CONFIG_DEFAULT_AS=y
87# CONFIG_DEFAULT_NOOP is not set 87# CONFIG_DEFAULT_NOOP is not set
88CONFIG_DEFAULT_IOSCHED="anticipatory" 88CONFIG_DEFAULT_IOSCHED="anticipatory"
89CONFIG_SYSVIPC_COMPAT=y 89CONFIG_SYSVIPC_COMPAT=y
90CONFIG_GENERIC_HARDIRQS=y
90 91
91# 92#
92# General machine setup 93# General machine setup
@@ -183,6 +184,8 @@ CONFIG_INET_ESP=y
183CONFIG_INET_IPCOMP=y 184CONFIG_INET_IPCOMP=y
184CONFIG_INET_XFRM_TUNNEL=y 185CONFIG_INET_XFRM_TUNNEL=y
185CONFIG_INET_TUNNEL=y 186CONFIG_INET_TUNNEL=y
187CONFIG_INET_XFRM_MODE_TRANSPORT=y
188CONFIG_INET_XFRM_MODE_TUNNEL=y
186CONFIG_INET_DIAG=y 189CONFIG_INET_DIAG=y
187CONFIG_INET_TCP_DIAG=y 190CONFIG_INET_TCP_DIAG=y
188CONFIG_TCP_CONG_ADVANCED=y 191CONFIG_TCP_CONG_ADVANCED=y
@@ -198,6 +201,9 @@ CONFIG_TCP_CONG_HSTCP=m
198CONFIG_TCP_CONG_HYBLA=m 201CONFIG_TCP_CONG_HYBLA=m
199CONFIG_TCP_CONG_VEGAS=m 202CONFIG_TCP_CONG_VEGAS=m
200CONFIG_TCP_CONG_SCALABLE=m 203CONFIG_TCP_CONG_SCALABLE=m
204CONFIG_TCP_CONG_LP=m
205CONFIG_TCP_CONG_VENO=m
206CONFIG_TCP_CONG_COMPOUND=m
201CONFIG_IPV6=m 207CONFIG_IPV6=m
202CONFIG_IPV6_PRIVACY=y 208CONFIG_IPV6_PRIVACY=y
203CONFIG_IPV6_ROUTER_PREF=y 209CONFIG_IPV6_ROUTER_PREF=y
@@ -207,7 +213,10 @@ CONFIG_INET6_ESP=m
207CONFIG_INET6_IPCOMP=m 213CONFIG_INET6_IPCOMP=m
208CONFIG_INET6_XFRM_TUNNEL=m 214CONFIG_INET6_XFRM_TUNNEL=m
209CONFIG_INET6_TUNNEL=m 215CONFIG_INET6_TUNNEL=m
216CONFIG_INET6_XFRM_MODE_TRANSPORT=m
217CONFIG_INET6_XFRM_MODE_TUNNEL=m
210CONFIG_IPV6_TUNNEL=m 218CONFIG_IPV6_TUNNEL=m
219# CONFIG_NETWORK_SECMARK is not set
211# CONFIG_NETFILTER is not set 220# CONFIG_NETFILTER is not set
212 221
213# 222#
@@ -260,6 +269,7 @@ CONFIG_VLAN_8021Q=m
260# Network testing 269# Network testing
261# 270#
262CONFIG_NET_PKTGEN=m 271CONFIG_NET_PKTGEN=m
272CONFIG_NET_TCPPROBE=m
263# CONFIG_HAMRADIO is not set 273# CONFIG_HAMRADIO is not set
264# CONFIG_IRDA is not set 274# CONFIG_IRDA is not set
265# CONFIG_BT is not set 275# CONFIG_BT is not set
@@ -562,6 +572,7 @@ CONFIG_BNX2=m
562# CONFIG_CHELSIO_T1 is not set 572# CONFIG_CHELSIO_T1 is not set
563# CONFIG_IXGB is not set 573# CONFIG_IXGB is not set
564# CONFIG_S2IO is not set 574# CONFIG_S2IO is not set
575# CONFIG_MYRI10GE is not set
565 576
566# 577#
567# Token Ring devices 578# Token Ring devices
@@ -811,6 +822,7 @@ CONFIG_HWMON=y
811# Multimedia devices 822# Multimedia devices
812# 823#
813# CONFIG_VIDEO_DEV is not set 824# CONFIG_VIDEO_DEV is not set
825CONFIG_VIDEO_V4L2=y
814 826
815# 827#
816# Digital Video Broadcasting Devices 828# Digital Video Broadcasting Devices
@@ -1135,6 +1147,19 @@ CONFIG_USB_HIDDEV=y
1135# CONFIG_RTC_CLASS is not set 1147# CONFIG_RTC_CLASS is not set
1136 1148
1137# 1149#
1150# DMA Engine support
1151#
1152# CONFIG_DMA_ENGINE is not set
1153
1154#
1155# DMA Clients
1156#
1157
1158#
1159# DMA Devices
1160#
1161
1162#
1138# Misc Linux/SPARC drivers 1163# Misc Linux/SPARC drivers
1139# 1164#
1140CONFIG_SUN_OPENPROMIO=m 1165CONFIG_SUN_OPENPROMIO=m