aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-12-29 00:16:40 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-31 17:06:06 -0500
commit55d0bef587aa438fe5e8bed2ecce8611ebcd4c1a (patch)
treeabb5857466852a465deb1ad711085804d526549d
parente3a411a3dfc1d633504aa63efab32b7e00318454 (diff)
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/defconfig34
1 files changed, 26 insertions, 8 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index bda1436aced1..5a9e68b13e60 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.19 3# Linux kernel version: 2.6.20-rc2
4# Sat Dec 9 15:41:30 2006 4# Thu Dec 28 15:09:49 2006
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -334,7 +334,7 @@ CONFIG_BLK_DEV_LOOP=m
334CONFIG_BLK_DEV_CRYPTOLOOP=m 334CONFIG_BLK_DEV_CRYPTOLOOP=m
335CONFIG_BLK_DEV_NBD=m 335CONFIG_BLK_DEV_NBD=m
336# CONFIG_BLK_DEV_SX8 is not set 336# CONFIG_BLK_DEV_SX8 is not set
337CONFIG_BLK_DEV_UB=m 337# CONFIG_BLK_DEV_UB is not set
338# CONFIG_BLK_DEV_RAM is not set 338# CONFIG_BLK_DEV_RAM is not set
339# CONFIG_BLK_DEV_INITRD is not set 339# CONFIG_BLK_DEV_INITRD is not set
340CONFIG_CDROM_PKTCDVD=m 340CONFIG_CDROM_PKTCDVD=m
@@ -840,6 +840,7 @@ CONFIG_HWMON=y
840# CONFIG_SENSORS_LM92 is not set 840# CONFIG_SENSORS_LM92 is not set
841# CONFIG_SENSORS_MAX1619 is not set 841# CONFIG_SENSORS_MAX1619 is not set
842# CONFIG_SENSORS_PC87360 is not set 842# CONFIG_SENSORS_PC87360 is not set
843# CONFIG_SENSORS_PC87427 is not set
843# CONFIG_SENSORS_SIS5595 is not set 844# CONFIG_SENSORS_SIS5595 is not set
844# CONFIG_SENSORS_SMSC47M1 is not set 845# CONFIG_SENSORS_SMSC47M1 is not set
845# CONFIG_SENSORS_SMSC47M192 is not set 846# CONFIG_SENSORS_SMSC47M192 is not set
@@ -850,6 +851,7 @@ CONFIG_HWMON=y
850# CONFIG_SENSORS_W83781D is not set 851# CONFIG_SENSORS_W83781D is not set
851# CONFIG_SENSORS_W83791D is not set 852# CONFIG_SENSORS_W83791D is not set
852# CONFIG_SENSORS_W83792D is not set 853# CONFIG_SENSORS_W83792D is not set
854# CONFIG_SENSORS_W83793 is not set
853# CONFIG_SENSORS_W83L785TS is not set 855# CONFIG_SENSORS_W83L785TS is not set
854# CONFIG_SENSORS_W83627HF is not set 856# CONFIG_SENSORS_W83627HF is not set
855# CONFIG_SENSORS_W83627EHF is not set 857# CONFIG_SENSORS_W83627EHF is not set
@@ -962,7 +964,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
962# 964#
963CONFIG_SND_MPU401_UART=m 965CONFIG_SND_MPU401_UART=m
964CONFIG_SND_AC97_CODEC=m 966CONFIG_SND_AC97_CODEC=m
965CONFIG_SND_AC97_BUS=m
966CONFIG_SND_DUMMY=m 967CONFIG_SND_DUMMY=m
967CONFIG_SND_VIRMIDI=m 968CONFIG_SND_VIRMIDI=m
968CONFIG_SND_MTPAV=m 969CONFIG_SND_MTPAV=m
@@ -1045,6 +1046,7 @@ CONFIG_SND_SUN_CS4231=m
1045# Open Sound System 1046# Open Sound System
1046# 1047#
1047# CONFIG_SOUND_PRIME is not set 1048# CONFIG_SOUND_PRIME is not set
1049CONFIG_AC97_BUS=m
1048 1050
1049# 1051#
1050# HID Devices 1052# HID Devices
@@ -1096,7 +1098,19 @@ CONFIG_USB_UHCI_HCD=m
1096# 1098#
1097# may also be needed; see USB_STORAGE Help for more information 1099# may also be needed; see USB_STORAGE Help for more information
1098# 1100#
1099# CONFIG_USB_STORAGE is not set 1101CONFIG_USB_STORAGE=m
1102# CONFIG_USB_STORAGE_DEBUG is not set
1103# CONFIG_USB_STORAGE_DATAFAB is not set
1104# CONFIG_USB_STORAGE_FREECOM is not set
1105# CONFIG_USB_STORAGE_ISD200 is not set
1106# CONFIG_USB_STORAGE_DPCM is not set
1107# CONFIG_USB_STORAGE_USBAT is not set
1108# CONFIG_USB_STORAGE_SDDR09 is not set
1109# CONFIG_USB_STORAGE_SDDR55 is not set
1110# CONFIG_USB_STORAGE_JUMPSHOT is not set
1111# CONFIG_USB_STORAGE_ALAUDA is not set
1112# CONFIG_USB_STORAGE_ONETOUCH is not set
1113# CONFIG_USB_STORAGE_KARMA is not set
1100# CONFIG_USB_LIBUSUAL is not set 1114# CONFIG_USB_LIBUSUAL is not set
1101 1115
1102# 1116#
@@ -1222,6 +1236,10 @@ CONFIG_USB_HIDDEV=y
1222# 1236#
1223 1237
1224# 1238#
1239# Virtualization
1240#
1241
1242#
1225# Misc Linux/SPARC drivers 1243# Misc Linux/SPARC drivers
1226# 1244#
1227CONFIG_SUN_OPENPROMIO=m 1245CONFIG_SUN_OPENPROMIO=m
@@ -1397,6 +1415,8 @@ CONFIG_PRINTK_TIME=y
1397CONFIG_ENABLE_MUST_CHECK=y 1415CONFIG_ENABLE_MUST_CHECK=y
1398CONFIG_MAGIC_SYSRQ=y 1416CONFIG_MAGIC_SYSRQ=y
1399# CONFIG_UNUSED_SYMBOLS is not set 1417# CONFIG_UNUSED_SYMBOLS is not set
1418CONFIG_DEBUG_FS=y
1419# CONFIG_HEADERS_CHECK is not set
1400CONFIG_DEBUG_KERNEL=y 1420CONFIG_DEBUG_KERNEL=y
1401CONFIG_LOG_BUF_SHIFT=18 1421CONFIG_LOG_BUF_SHIFT=18
1402CONFIG_DETECT_SOFTLOCKUP=y 1422CONFIG_DETECT_SOFTLOCKUP=y
@@ -1414,12 +1434,9 @@ CONFIG_SCHEDSTATS=y
1414# CONFIG_DEBUG_KOBJECT is not set 1434# CONFIG_DEBUG_KOBJECT is not set
1415CONFIG_DEBUG_BUGVERBOSE=y 1435CONFIG_DEBUG_BUGVERBOSE=y
1416# CONFIG_DEBUG_INFO is not set 1436# CONFIG_DEBUG_INFO is not set
1417CONFIG_DEBUG_FS=y
1418# CONFIG_DEBUG_VM is not set 1437# CONFIG_DEBUG_VM is not set
1419# CONFIG_DEBUG_LIST is not set 1438# CONFIG_DEBUG_LIST is not set
1420# CONFIG_UNWIND_INFO is not set
1421CONFIG_FORCED_INLINING=y 1439CONFIG_FORCED_INLINING=y
1422# CONFIG_HEADERS_CHECK is not set
1423# CONFIG_RCU_TORTURE_TEST is not set 1440# CONFIG_RCU_TORTURE_TEST is not set
1424# CONFIG_LKDTM is not set 1441# CONFIG_LKDTM is not set
1425# CONFIG_DEBUG_STACK_USAGE is not set 1442# CONFIG_DEBUG_STACK_USAGE is not set
@@ -1489,3 +1506,4 @@ CONFIG_LIBCRC32C=m
1489CONFIG_ZLIB_INFLATE=y 1506CONFIG_ZLIB_INFLATE=y
1490CONFIG_ZLIB_DEFLATE=y 1507CONFIG_ZLIB_DEFLATE=y
1491CONFIG_PLIST=y 1508CONFIG_PLIST=y
1509CONFIG_IOMAP_COPY=y