diff options
author | Arnd Bergmann <arnd@arndb.de> | 2006-10-24 12:01:43 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-24 22:10:41 -0400 |
commit | b910ecf6bf221bb06f37e44765307c42b20db205 (patch) | |
tree | e456cefd1791a00a1deb6c0b9b048e0efef6a48e | |
parent | 274cef5e9d0e494ad84dbc28513b0bb6e3d847ae (diff) |
[POWERPC] cell: update defconfig
===================================================================
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/configs/cell_defconfig | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index 892d5dd3254e..0aba06d7d2ec 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
@@ -254,6 +254,7 @@ CONFIG_SYN_COOKIES=y | |||
254 | CONFIG_INET_TUNNEL=y | 254 | CONFIG_INET_TUNNEL=y |
255 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 255 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
256 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 256 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
257 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
257 | CONFIG_INET_DIAG=y | 258 | CONFIG_INET_DIAG=y |
258 | CONFIG_INET_TCP_DIAG=y | 259 | CONFIG_INET_TCP_DIAG=y |
259 | # CONFIG_TCP_CONG_ADVANCED is not set | 260 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -275,7 +276,9 @@ CONFIG_INET6_XFRM_TUNNEL=m | |||
275 | CONFIG_INET6_TUNNEL=m | 276 | CONFIG_INET6_TUNNEL=m |
276 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | 277 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
277 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 278 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
279 | # CONFIG_INET6_XFRM_MODE_BEET is not set | ||
278 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 280 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
281 | # CONFIG_IPV6_SIT is not set | ||
279 | CONFIG_IPV6_TUNNEL=m | 282 | CONFIG_IPV6_TUNNEL=m |
280 | # CONFIG_IPV6_SUBTREES is not set | 283 | # CONFIG_IPV6_SUBTREES is not set |
281 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 284 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
@@ -406,6 +409,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
406 | # CONFIG_ATA_OVER_ETH is not set | 409 | # CONFIG_ATA_OVER_ETH is not set |
407 | 410 | ||
408 | # | 411 | # |
412 | # Misc devices | ||
413 | # | ||
414 | # CONFIG_SGI_IOC4 is not set | ||
415 | # CONFIG_TIFM_CORE is not set | ||
416 | |||
417 | # | ||
409 | # ATA/ATAPI/MFM/RLL support | 418 | # ATA/ATAPI/MFM/RLL support |
410 | # | 419 | # |
411 | CONFIG_IDE=y | 420 | CONFIG_IDE=y |
@@ -738,7 +747,6 @@ CONFIG_GEN_RTC=y | |||
738 | # TPM devices | 747 | # TPM devices |
739 | # | 748 | # |
740 | # CONFIG_TCG_TPM is not set | 749 | # CONFIG_TCG_TPM is not set |
741 | # CONFIG_TELCLOCK is not set | ||
742 | 750 | ||
743 | # | 751 | # |
744 | # I2C support | 752 | # I2C support |
@@ -802,6 +810,7 @@ CONFIG_I2C_ALGOBIT=y | |||
802 | # | 810 | # |
803 | # Dallas's 1-wire bus | 811 | # Dallas's 1-wire bus |
804 | # | 812 | # |
813 | # CONFIG_W1 is not set | ||
805 | 814 | ||
806 | # | 815 | # |
807 | # Hardware Monitoring support | 816 | # Hardware Monitoring support |
@@ -810,14 +819,9 @@ CONFIG_I2C_ALGOBIT=y | |||
810 | # CONFIG_HWMON_VID is not set | 819 | # CONFIG_HWMON_VID is not set |
811 | 820 | ||
812 | # | 821 | # |
813 | # Misc devices | ||
814 | # | ||
815 | |||
816 | # | ||
817 | # Multimedia devices | 822 | # Multimedia devices |
818 | # | 823 | # |
819 | # CONFIG_VIDEO_DEV is not set | 824 | # CONFIG_VIDEO_DEV is not set |
820 | CONFIG_VIDEO_V4L2=y | ||
821 | 825 | ||
822 | # | 826 | # |
823 | # Digital Video Broadcasting Devices | 827 | # Digital Video Broadcasting Devices |
@@ -923,6 +927,7 @@ CONFIG_EXT3_FS=y | |||
923 | CONFIG_EXT3_FS_XATTR=y | 927 | CONFIG_EXT3_FS_XATTR=y |
924 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 928 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
925 | # CONFIG_EXT3_FS_SECURITY is not set | 929 | # CONFIG_EXT3_FS_SECURITY is not set |
930 | # CONFIG_EXT4DEV_FS is not set | ||
926 | CONFIG_JBD=y | 931 | CONFIG_JBD=y |
927 | # CONFIG_JBD_DEBUG is not set | 932 | # CONFIG_JBD_DEBUG is not set |
928 | CONFIG_FS_MBCACHE=y | 933 | CONFIG_FS_MBCACHE=y |
@@ -930,6 +935,7 @@ CONFIG_FS_MBCACHE=y | |||
930 | # CONFIG_JFS_FS is not set | 935 | # CONFIG_JFS_FS is not set |
931 | CONFIG_FS_POSIX_ACL=y | 936 | CONFIG_FS_POSIX_ACL=y |
932 | # CONFIG_XFS_FS is not set | 937 | # CONFIG_XFS_FS is not set |
938 | # CONFIG_GFS2_FS is not set | ||
933 | # CONFIG_OCFS2_FS is not set | 939 | # CONFIG_OCFS2_FS is not set |
934 | # CONFIG_MINIX_FS is not set | 940 | # CONFIG_MINIX_FS is not set |
935 | # CONFIG_ROMFS_FS is not set | 941 | # CONFIG_ROMFS_FS is not set |
@@ -1129,6 +1135,7 @@ CONFIG_DEBUG_FS=y | |||
1129 | # CONFIG_DEBUG_VM is not set | 1135 | # CONFIG_DEBUG_VM is not set |
1130 | # CONFIG_DEBUG_LIST is not set | 1136 | # CONFIG_DEBUG_LIST is not set |
1131 | # CONFIG_FORCED_INLINING is not set | 1137 | # CONFIG_FORCED_INLINING is not set |
1138 | # CONFIG_HEADERS_CHECK is not set | ||
1132 | # CONFIG_RCU_TORTURE_TEST is not set | 1139 | # CONFIG_RCU_TORTURE_TEST is not set |
1133 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1140 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1134 | # CONFIG_DEBUG_STACK_USAGE is not set | 1141 | # CONFIG_DEBUG_STACK_USAGE is not set |