aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-05-11 17:32:07 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-05-12 00:39:24 -0400
commitd77311f942731064f4fb904de2ebbb238ee1d03e (patch)
tree3445c53f87a41ebc2ec4830c45578bafa00b7f6b /arch/sparc64
parent7cac4ce59b3bc2b5c91b7e0cf4e6943e223076ec (diff)
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/defconfig18
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 6ac5a12fe00d..585ef4fb7591 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.21 3# Linux kernel version: 2.6.21
4# Thu May 10 15:42:17 2007 4# Fri May 11 14:31:45 2007
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -68,7 +68,11 @@ CONFIG_BUG=y
68CONFIG_ELF_CORE=y 68CONFIG_ELF_CORE=y
69CONFIG_BASE_FULL=y 69CONFIG_BASE_FULL=y
70CONFIG_FUTEX=y 70CONFIG_FUTEX=y
71CONFIG_ANON_INODES=y
71CONFIG_EPOLL=y 72CONFIG_EPOLL=y
73CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y
75CONFIG_EVENTFD=y
72CONFIG_SHMEM=y 76CONFIG_SHMEM=y
73CONFIG_VM_EVENT_COUNTERS=y 77CONFIG_VM_EVENT_COUNTERS=y
74CONFIG_SLUB_DEBUG=y 78CONFIG_SLUB_DEBUG=y
@@ -925,12 +929,8 @@ CONFIG_HWMON=y
925# Multimedia devices 929# Multimedia devices
926# 930#
927# CONFIG_VIDEO_DEV is not set 931# CONFIG_VIDEO_DEV is not set
928 932# CONFIG_DVB_CORE is not set
929# 933# CONFIG_DAB is not set
930# Digital Video Broadcasting Devices
931#
932# CONFIG_DVB is not set
933# CONFIG_USB_DABUSB is not set
934 934
935# 935#
936# Graphics support 936# Graphics support
@@ -987,6 +987,7 @@ CONFIG_FB_RADEON_I2C=y
987# CONFIG_FB_VT8623 is not set 987# CONFIG_FB_VT8623 is not set
988# CONFIG_FB_TRIDENT is not set 988# CONFIG_FB_TRIDENT is not set
989# CONFIG_FB_ARK is not set 989# CONFIG_FB_ARK is not set
990# CONFIG_FB_PM3 is not set
990# CONFIG_FB_XVR500 is not set 991# CONFIG_FB_XVR500 is not set
991# CONFIG_FB_XVR2500 is not set 992# CONFIG_FB_XVR2500 is not set
992# CONFIG_FB_PCI is not set 993# CONFIG_FB_PCI is not set
@@ -1116,6 +1117,7 @@ CONFIG_SND_ALI5451=m
1116# USB devices 1117# USB devices
1117# 1118#
1118# CONFIG_SND_USB_AUDIO is not set 1119# CONFIG_SND_USB_AUDIO is not set
1120# CONFIG_SND_USB_CAIAQ is not set
1119 1121
1120# 1122#
1121# ALSA Sparc devices 1123# ALSA Sparc devices
@@ -1125,7 +1127,7 @@ CONFIG_SND_SUN_CS4231=m
1125# CONFIG_SND_SUN_DBRI is not set 1127# CONFIG_SND_SUN_DBRI is not set
1126 1128
1127# 1129#
1128# SoC audio support 1130# System on Chip audio support
1129# 1131#
1130# CONFIG_SND_SOC is not set 1132# CONFIG_SND_SOC is not set
1131 1133