aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-09-16 12:52:36 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-09-16 12:52:36 -0400
commit58ea1aa07e3cb4674ab0261b45aa1ba68282a79d (patch)
tree24faaf5343363ae9fe63b43b49b1ae202b6550f8 /arch/sparc64
parentd0174640eedc1cd756754f03afe2dbb3d56de74e (diff)
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/defconfig16
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 68338a601f70..7d07297db878 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.23-rc1 3# Linux kernel version: 2.6.23-rc6
4# Sun Jul 22 19:24:37 2007 4# Sun Sep 16 09:52:11 2007
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -32,15 +32,11 @@ CONFIG_HZ=100
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33 33
34# 34#
35# Code maturity level options 35# General setup
36# 36#
37CONFIG_EXPERIMENTAL=y 37CONFIG_EXPERIMENTAL=y
38CONFIG_BROKEN_ON_SMP=y 38CONFIG_BROKEN_ON_SMP=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 39CONFIG_INIT_ENV_ARG_LIMIT=32
40
41#
42# General setup
43#
44CONFIG_LOCALVERSION="" 40CONFIG_LOCALVERSION=""
45# CONFIG_LOCALVERSION_AUTO is not set 41# CONFIG_LOCALVERSION_AUTO is not set
46CONFIG_SWAP=y 42CONFIG_SWAP=y
@@ -555,6 +551,7 @@ CONFIG_E1000_NAPI=y
555# CONFIG_SIS190 is not set 551# CONFIG_SIS190 is not set
556# CONFIG_SKGE is not set 552# CONFIG_SKGE is not set
557# CONFIG_SKY2 is not set 553# CONFIG_SKY2 is not set
554# CONFIG_SK98LIN is not set
558# CONFIG_VIA_VELOCITY is not set 555# CONFIG_VIA_VELOCITY is not set
559CONFIG_TIGON3=m 556CONFIG_TIGON3=m
560CONFIG_BNX2=m 557CONFIG_BNX2=m
@@ -809,6 +806,7 @@ CONFIG_HWMON=y
809# CONFIG_SENSORS_SMSC47M1 is not set 806# CONFIG_SENSORS_SMSC47M1 is not set
810# CONFIG_SENSORS_SMSC47M192 is not set 807# CONFIG_SENSORS_SMSC47M192 is not set
811# CONFIG_SENSORS_SMSC47B397 is not set 808# CONFIG_SENSORS_SMSC47B397 is not set
809# CONFIG_SENSORS_THMC50 is not set
812# CONFIG_SENSORS_VIA686A is not set 810# CONFIG_SENSORS_VIA686A is not set
813# CONFIG_SENSORS_VT1211 is not set 811# CONFIG_SENSORS_VT1211 is not set
814# CONFIG_SENSORS_VT8231 is not set 812# CONFIG_SENSORS_VT8231 is not set
@@ -1162,10 +1160,6 @@ CONFIG_USB_STORAGE=m
1162# CONFIG_MMC is not set 1160# CONFIG_MMC is not set
1163# CONFIG_NEW_LEDS is not set 1161# CONFIG_NEW_LEDS is not set
1164# CONFIG_INFINIBAND is not set 1162# CONFIG_INFINIBAND is not set
1165
1166#
1167# Real Time Clock
1168#
1169# CONFIG_RTC_CLASS is not set 1163# CONFIG_RTC_CLASS is not set
1170 1164
1171# 1165#