aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/cell_defconfig
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-12-03 23:59:07 -0500
committerPaul Mackerras <paulus@samba.org>2006-12-03 23:59:07 -0500
commit79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch)
tree6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/powerpc/configs/cell_defconfig
parent19a79859e168640f8e16d7b216d211c1c52b687a (diff)
parent2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff)
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/powerpc/configs/cell_defconfig')
-rw-r--r--arch/powerpc/configs/cell_defconfig19
1 files changed, 13 insertions, 6 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index c5c54f49ae5..dbcd4e3329d 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -268,6 +268,7 @@ CONFIG_SYN_COOKIES=y
268CONFIG_INET_TUNNEL=y 268CONFIG_INET_TUNNEL=y
269CONFIG_INET_XFRM_MODE_TRANSPORT=y 269CONFIG_INET_XFRM_MODE_TRANSPORT=y
270CONFIG_INET_XFRM_MODE_TUNNEL=y 270CONFIG_INET_XFRM_MODE_TUNNEL=y
271# CONFIG_INET_XFRM_MODE_BEET is not set
271CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
272CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
273# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
@@ -289,7 +290,9 @@ CONFIG_INET6_XFRM_TUNNEL=m
289CONFIG_INET6_TUNNEL=m 290CONFIG_INET6_TUNNEL=m
290CONFIG_INET6_XFRM_MODE_TRANSPORT=y 291CONFIG_INET6_XFRM_MODE_TRANSPORT=y
291CONFIG_INET6_XFRM_MODE_TUNNEL=y 292CONFIG_INET6_XFRM_MODE_TUNNEL=y
293# CONFIG_INET6_XFRM_MODE_BEET is not set
292# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 294# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
295# CONFIG_IPV6_SIT is not set
293CONFIG_IPV6_TUNNEL=m 296CONFIG_IPV6_TUNNEL=m
294# CONFIG_IPV6_SUBTREES is not set 297# CONFIG_IPV6_SUBTREES is not set
295# CONFIG_IPV6_MULTIPLE_TABLES is not set 298# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -420,6 +423,12 @@ CONFIG_BLK_DEV_INITRD=y
420# CONFIG_ATA_OVER_ETH is not set 423# CONFIG_ATA_OVER_ETH is not set
421 424
422# 425#
426# Misc devices
427#
428# CONFIG_SGI_IOC4 is not set
429# CONFIG_TIFM_CORE is not set
430
431#
423# ATA/ATAPI/MFM/RLL support 432# ATA/ATAPI/MFM/RLL support
424# 433#
425CONFIG_IDE=y 434CONFIG_IDE=y
@@ -752,7 +761,6 @@ CONFIG_GEN_RTC=y
752# TPM devices 761# TPM devices
753# 762#
754# CONFIG_TCG_TPM is not set 763# CONFIG_TCG_TPM is not set
755# CONFIG_TELCLOCK is not set
756 764
757# 765#
758# I2C support 766# I2C support
@@ -816,6 +824,7 @@ CONFIG_I2C_ALGOBIT=y
816# 824#
817# Dallas's 1-wire bus 825# Dallas's 1-wire bus
818# 826#
827# CONFIG_W1 is not set
819 828
820# 829#
821# Hardware Monitoring support 830# Hardware Monitoring support
@@ -824,14 +833,9 @@ CONFIG_I2C_ALGOBIT=y
824# CONFIG_HWMON_VID is not set 833# CONFIG_HWMON_VID is not set
825 834
826# 835#
827# Misc devices
828#
829
830#
831# Multimedia devices 836# Multimedia devices
832# 837#
833# CONFIG_VIDEO_DEV is not set 838# CONFIG_VIDEO_DEV is not set
834CONFIG_VIDEO_V4L2=y
835 839
836# 840#
837# Digital Video Broadcasting Devices 841# Digital Video Broadcasting Devices
@@ -937,6 +941,7 @@ CONFIG_EXT3_FS=y
937CONFIG_EXT3_FS_XATTR=y 941CONFIG_EXT3_FS_XATTR=y
938# CONFIG_EXT3_FS_POSIX_ACL is not set 942# CONFIG_EXT3_FS_POSIX_ACL is not set
939# CONFIG_EXT3_FS_SECURITY is not set 943# CONFIG_EXT3_FS_SECURITY is not set
944# CONFIG_EXT4DEV_FS is not set
940CONFIG_JBD=y 945CONFIG_JBD=y
941# CONFIG_JBD_DEBUG is not set 946# CONFIG_JBD_DEBUG is not set
942CONFIG_FS_MBCACHE=y 947CONFIG_FS_MBCACHE=y
@@ -944,6 +949,7 @@ CONFIG_FS_MBCACHE=y
944# CONFIG_JFS_FS is not set 949# CONFIG_JFS_FS is not set
945CONFIG_FS_POSIX_ACL=y 950CONFIG_FS_POSIX_ACL=y
946# CONFIG_XFS_FS is not set 951# CONFIG_XFS_FS is not set
952# CONFIG_GFS2_FS is not set
947# CONFIG_OCFS2_FS is not set 953# CONFIG_OCFS2_FS is not set
948# CONFIG_MINIX_FS is not set 954# CONFIG_MINIX_FS is not set
949# CONFIG_ROMFS_FS is not set 955# CONFIG_ROMFS_FS is not set
@@ -1143,6 +1149,7 @@ CONFIG_DEBUG_FS=y
1143# CONFIG_DEBUG_VM is not set 1149# CONFIG_DEBUG_VM is not set
1144# CONFIG_DEBUG_LIST is not set 1150# CONFIG_DEBUG_LIST is not set
1145# CONFIG_FORCED_INLINING is not set 1151# CONFIG_FORCED_INLINING is not set
1152# CONFIG_HEADERS_CHECK is not set
1146# CONFIG_RCU_TORTURE_TEST is not set 1153# CONFIG_RCU_TORTURE_TEST is not set
1147# CONFIG_DEBUG_STACKOVERFLOW is not set 1154# CONFIG_DEBUG_STACKOVERFLOW is not set
1148# CONFIG_DEBUG_STACK_USAGE is not set 1155# CONFIG_DEBUG_STACK_USAGE is not set