aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2005-01-09 19:25:11 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2005-01-09 19:25:11 -0800
commit5dc9df6c90c5ffeecddec9f537b26b2cfc17ae2b (patch)
treecd287ae8a02bf5acac6718ace85327fc54bc72e2 /arch
parentcf4a33ef7ef44ef97446527317254783d5f448de (diff)
downloadhistory-5dc9df6c90c5ffeecddec9f537b26b2cfc17ae2b.tar.gz
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/defconfig21
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index c5f2317481f46f..2166fd9cdcebd7 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.10
-# Mon Dec 27 22:36:56 2004
+# Mon Jan 10 11:24:25 2005
#
CONFIG_64BIT=y
CONFIG_MMU=y
@@ -79,6 +79,7 @@ CONFIG_US3_FREQ=m
CONFIG_US2E_FREQ=m
CONFIG_SPARC64=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_HUGETLB_PAGE_SIZE_4MB=y
# CONFIG_HUGETLB_PAGE_SIZE_512K is not set
# CONFIG_HUGETLB_PAGE_SIZE_64K is not set
@@ -336,6 +337,7 @@ CONFIG_SCSI_CONSTANTS=y
#
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
#
# SCSI low-level drivers
@@ -395,7 +397,6 @@ CONFIG_SCSI_QLA2XXX=y
# CONFIG_SCSI_QLA2300 is not set
# CONFIG_SCSI_QLA2322 is not set
# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA6322 is not set
CONFIG_SCSI_DC395x=m
# CONFIG_SCSI_DC390T is not set
CONFIG_SCSI_DEBUG=m
@@ -619,8 +620,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_COMPAT_IPCHAINS=m
-CONFIG_IP_NF_COMPAT_IPFWADM=m
#
# IPv6: Netfilter Configuration
@@ -894,7 +893,6 @@ CONFIG_B44=m
CONFIG_FORCEDETH=m
CONFIG_DGRS=m
CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
CONFIG_E100=m
CONFIG_E100_NAPI=y
CONFIG_FEALNX=m
@@ -1081,7 +1079,6 @@ CONFIG_UNIX98_PTY_COUNT=256
# XFree86 DRI support
#
CONFIG_DRM=y
-CONFIG_DRM_FFB=m
CONFIG_DRM_TDFX=m
# CONFIG_DRM_R128 is not set
@@ -1112,13 +1109,14 @@ CONFIG_SOUND_GAMEPORT=m
# CONFIG_GAMEPORT_EMU10K1 is not set
# CONFIG_GAMEPORT_VORTEX is not set
# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_CS461x is not set
+CONFIG_GAMEPORT_CS461X=m
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
# CONFIG_SERIO_SERPORT is not set
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=m
#
@@ -1239,6 +1237,7 @@ CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
CONFIG_JFS_FS=m
CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not set
CONFIG_FS_POSIX_ACL=y
@@ -1308,7 +1307,6 @@ CONFIG_CRAMFS=m
CONFIG_VXFS_FS=m
CONFIG_HPFS_FS=m
CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m
CONFIG_UFS_FS_WRITE=y
@@ -1579,6 +1577,8 @@ CONFIG_SND_CS46XX=m
# CONFIG_SND_CS46XX_NEW_DSP is not set
CONFIG_SND_CS4281=m
CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_CA0106=m
CONFIG_SND_KORG1212=m
CONFIG_SND_MIXART=m
CONFIG_SND_NM256=m
@@ -1603,13 +1603,13 @@ CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_VIA82XX is not set
+CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VX222=m
#
# USB devices
#
# CONFIG_SND_USB_AUDIO is not set
-CONFIG_SND_USB_USX2Y=m
#
# ALSA Sparc devices
@@ -1691,7 +1691,6 @@ CONFIG_USB_ATI_REMOTE=m
#
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
-CONFIG_USB_HPUSBSCSI=m
#
# USB Multimedia devices
@@ -1862,7 +1861,7 @@ CONFIG_SCHEDSTATS=y
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_KPROBES=y