diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-09-10 16:15:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-10 17:15:29 -0400 |
commit | 9e7222c83560186686319f2892f43fc557baed2d (patch) | |
tree | f5f78fdec1fd0e42011a34cd6a8b4c20a25d1c1b /arch/m68k/configs/sun3_defconfig | |
parent | 5368f69c8b155d6e82dfc622d817c882689e9cd9 (diff) |
m68k: Update defconfigs for 2.6.27-rc6
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/configs/sun3_defconfig')
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 296340d2b315..cb62b96d766e 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:11 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
@@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
84 | # CONFIG_HAVE_CLK is not set | ||
81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
@@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
98 | 104 | ||
99 | # | 105 | # |
100 | # IO Schedulers | 106 | # IO Schedulers |
@@ -149,10 +155,6 @@ CONFIG_BINFMT_MISC=m | |||
149 | CONFIG_PROC_HARDWARE=y | 155 | CONFIG_PROC_HARDWARE=y |
150 | CONFIG_ZONE_DMA=y | 156 | CONFIG_ZONE_DMA=y |
151 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 157 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
152 | |||
153 | # | ||
154 | # Networking | ||
155 | # | ||
156 | CONFIG_NET=y | 158 | CONFIG_NET=y |
157 | 159 | ||
158 | # | 160 | # |
@@ -166,6 +168,7 @@ CONFIG_XFRM=y | |||
166 | # CONFIG_XFRM_SUB_POLICY is not set | 168 | # CONFIG_XFRM_SUB_POLICY is not set |
167 | CONFIG_XFRM_MIGRATE=y | 169 | CONFIG_XFRM_MIGRATE=y |
168 | # CONFIG_XFRM_STATISTICS is not set | 170 | # CONFIG_XFRM_STATISTICS is not set |
171 | CONFIG_XFRM_IPCOMP=m | ||
169 | CONFIG_NET_KEY=y | 172 | CONFIG_NET_KEY=y |
170 | CONFIG_NET_KEY_MIGRATE=y | 173 | CONFIG_NET_KEY_MIGRATE=y |
171 | CONFIG_INET=y | 174 | CONFIG_INET=y |
@@ -399,6 +402,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
399 | # | 402 | # |
400 | # CONFIG_CFG80211 is not set | 403 | # CONFIG_CFG80211 is not set |
401 | CONFIG_WIRELESS_EXT=y | 404 | CONFIG_WIRELESS_EXT=y |
405 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
402 | # CONFIG_MAC80211 is not set | 406 | # CONFIG_MAC80211 is not set |
403 | CONFIG_IEEE80211=m | 407 | CONFIG_IEEE80211=m |
404 | # CONFIG_IEEE80211_DEBUG is not set | 408 | # CONFIG_IEEE80211_DEBUG is not set |
@@ -418,7 +422,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
418 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 422 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
419 | CONFIG_STANDALONE=y | 423 | CONFIG_STANDALONE=y |
420 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 424 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
421 | CONFIG_FW_LOADER=m | 425 | CONFIG_FW_LOADER=y |
426 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
427 | CONFIG_EXTRA_FIRMWARE="" | ||
422 | # CONFIG_SYS_HYPERVISOR is not set | 428 | # CONFIG_SYS_HYPERVISOR is not set |
423 | CONFIG_CONNECTOR=m | 429 | CONFIG_CONNECTOR=m |
424 | # CONFIG_MTD is not set | 430 | # CONFIG_MTD is not set |
@@ -436,6 +442,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
436 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 442 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
437 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 443 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
438 | CONFIG_ATA_OVER_ETH=m | 444 | CONFIG_ATA_OVER_ETH=m |
445 | # CONFIG_BLK_DEV_HD is not set | ||
439 | CONFIG_MISC_DEVICES=y | 446 | CONFIG_MISC_DEVICES=y |
440 | # CONFIG_EEPROM_93CX6 is not set | 447 | # CONFIG_EEPROM_93CX6 is not set |
441 | # CONFIG_ENCLOSURE_SERVICES is not set | 448 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -488,6 +495,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
488 | CONFIG_ISCSI_TCP=m | 495 | CONFIG_ISCSI_TCP=m |
489 | # CONFIG_SCSI_DEBUG is not set | 496 | # CONFIG_SCSI_DEBUG is not set |
490 | CONFIG_SUN3_SCSI=y | 497 | CONFIG_SUN3_SCSI=y |
498 | # CONFIG_SCSI_DH is not set | ||
491 | CONFIG_MD=y | 499 | CONFIG_MD=y |
492 | CONFIG_BLK_DEV_MD=m | 500 | CONFIG_BLK_DEV_MD=m |
493 | CONFIG_MD_LINEAR=m | 501 | CONFIG_MD_LINEAR=m |
@@ -496,7 +504,7 @@ CONFIG_MD_RAID1=m | |||
496 | # CONFIG_MD_RAID10 is not set | 504 | # CONFIG_MD_RAID10 is not set |
497 | CONFIG_MD_RAID456=m | 505 | CONFIG_MD_RAID456=m |
498 | CONFIG_MD_RAID5_RESHAPE=y | 506 | CONFIG_MD_RAID5_RESHAPE=y |
499 | CONFIG_MD_MULTIPATH=m | 507 | # CONFIG_MD_MULTIPATH is not set |
500 | # CONFIG_MD_FAULTY is not set | 508 | # CONFIG_MD_FAULTY is not set |
501 | CONFIG_BLK_DEV_DM=m | 509 | CONFIG_BLK_DEV_DM=m |
502 | # CONFIG_DM_DEBUG is not set | 510 | # CONFIG_DM_DEBUG is not set |
@@ -505,13 +513,9 @@ CONFIG_DM_SNAPSHOT=m | |||
505 | CONFIG_DM_MIRROR=m | 513 | CONFIG_DM_MIRROR=m |
506 | CONFIG_DM_ZERO=m | 514 | CONFIG_DM_ZERO=m |
507 | CONFIG_DM_MULTIPATH=m | 515 | CONFIG_DM_MULTIPATH=m |
508 | CONFIG_DM_MULTIPATH_EMC=m | ||
509 | CONFIG_DM_MULTIPATH_RDAC=m | ||
510 | CONFIG_DM_MULTIPATH_HP=m | ||
511 | # CONFIG_DM_DELAY is not set | 516 | # CONFIG_DM_DELAY is not set |
512 | CONFIG_DM_UEVENT=y | 517 | CONFIG_DM_UEVENT=y |
513 | CONFIG_NETDEVICES=y | 518 | CONFIG_NETDEVICES=y |
514 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
515 | CONFIG_DUMMY=m | 519 | CONFIG_DUMMY=m |
516 | # CONFIG_BONDING is not set | 520 | # CONFIG_BONDING is not set |
517 | CONFIG_MACVLAN=m | 521 | CONFIG_MACVLAN=m |
@@ -527,7 +531,6 @@ CONFIG_SUN3_82586=y | |||
527 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
528 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
529 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
530 | # CONFIG_B44 is not set | ||
531 | # CONFIG_NETDEV_1000 is not set | 534 | # CONFIG_NETDEV_1000 is not set |
532 | # CONFIG_NETDEV_10000 is not set | 535 | # CONFIG_NETDEV_10000 is not set |
533 | 536 | ||
@@ -617,6 +620,7 @@ CONFIG_SERIO_LIBPS2=m | |||
617 | # Character devices | 620 | # Character devices |
618 | # | 621 | # |
619 | CONFIG_VT=y | 622 | CONFIG_VT=y |
623 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
620 | CONFIG_VT_CONSOLE=y | 624 | CONFIG_VT_CONSOLE=y |
621 | CONFIG_HW_CONSOLE=y | 625 | CONFIG_HW_CONSOLE=y |
622 | CONFIG_VT_HW_CONSOLE_BINDING=y | 626 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -647,19 +651,20 @@ CONFIG_GEN_RTC_X=y | |||
647 | # CONFIG_POWER_SUPPLY is not set | 651 | # CONFIG_POWER_SUPPLY is not set |
648 | # CONFIG_HWMON is not set | 652 | # CONFIG_HWMON is not set |
649 | # CONFIG_THERMAL is not set | 653 | # CONFIG_THERMAL is not set |
654 | # CONFIG_THERMAL_HWMON is not set | ||
650 | # CONFIG_WATCHDOG is not set | 655 | # CONFIG_WATCHDOG is not set |
651 | 656 | ||
652 | # | 657 | # |
653 | # Sonics Silicon Backplane | 658 | # Sonics Silicon Backplane |
654 | # | 659 | # |
655 | CONFIG_SSB_POSSIBLE=y | ||
656 | # CONFIG_SSB is not set | ||
657 | 660 | ||
658 | # | 661 | # |
659 | # Multifunction device drivers | 662 | # Multifunction device drivers |
660 | # | 663 | # |
664 | # CONFIG_MFD_CORE is not set | ||
661 | # CONFIG_MFD_SM501 is not set | 665 | # CONFIG_MFD_SM501 is not set |
662 | # CONFIG_HTC_PASIC3 is not set | 666 | # CONFIG_HTC_PASIC3 is not set |
667 | # CONFIG_MFD_TMIO is not set | ||
663 | 668 | ||
664 | # | 669 | # |
665 | # Multimedia devices | 670 | # Multimedia devices |
@@ -727,10 +732,6 @@ CONFIG_LOGO=y | |||
727 | CONFIG_LOGO_LINUX_MONO=y | 732 | CONFIG_LOGO_LINUX_MONO=y |
728 | CONFIG_LOGO_LINUX_VGA16=y | 733 | CONFIG_LOGO_LINUX_VGA16=y |
729 | CONFIG_LOGO_LINUX_CLUT224=y | 734 | CONFIG_LOGO_LINUX_CLUT224=y |
730 | |||
731 | # | ||
732 | # Sound | ||
733 | # | ||
734 | # CONFIG_SOUND is not set | 735 | # CONFIG_SOUND is not set |
735 | CONFIG_HID_SUPPORT=y | 736 | CONFIG_HID_SUPPORT=y |
736 | CONFIG_HID=m | 737 | CONFIG_HID=m |
@@ -776,6 +777,7 @@ CONFIG_XFS_FS=m | |||
776 | CONFIG_OCFS2_FS=m | 777 | CONFIG_OCFS2_FS=m |
777 | CONFIG_OCFS2_FS_O2CB=m | 778 | CONFIG_OCFS2_FS_O2CB=m |
778 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 779 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
780 | # CONFIG_OCFS2_FS_STATS is not set | ||
779 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 781 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
780 | # CONFIG_OCFS2_DEBUG_FS is not set | 782 | # CONFIG_OCFS2_DEBUG_FS is not set |
781 | CONFIG_DNOTIFY=y | 783 | CONFIG_DNOTIFY=y |
@@ -835,6 +837,7 @@ CONFIG_HFSPLUS_FS=m | |||
835 | CONFIG_CRAMFS=m | 837 | CONFIG_CRAMFS=m |
836 | # CONFIG_VXFS_FS is not set | 838 | # CONFIG_VXFS_FS is not set |
837 | CONFIG_MINIX_FS=y | 839 | CONFIG_MINIX_FS=y |
840 | # CONFIG_OMFS_FS is not set | ||
838 | CONFIG_HPFS_FS=m | 841 | CONFIG_HPFS_FS=m |
839 | # CONFIG_QNX4FS_FS is not set | 842 | # CONFIG_QNX4FS_FS is not set |
840 | # CONFIG_ROMFS_FS is not set | 843 | # CONFIG_ROMFS_FS is not set |
@@ -847,18 +850,17 @@ CONFIG_NFS_FS=y | |||
847 | CONFIG_NFS_V3=y | 850 | CONFIG_NFS_V3=y |
848 | # CONFIG_NFS_V3_ACL is not set | 851 | # CONFIG_NFS_V3_ACL is not set |
849 | CONFIG_NFS_V4=y | 852 | CONFIG_NFS_V4=y |
853 | CONFIG_ROOT_NFS=y | ||
850 | CONFIG_NFSD=m | 854 | CONFIG_NFSD=m |
851 | CONFIG_NFSD_V3=y | 855 | CONFIG_NFSD_V3=y |
852 | # CONFIG_NFSD_V3_ACL is not set | 856 | # CONFIG_NFSD_V3_ACL is not set |
853 | # CONFIG_NFSD_V4 is not set | 857 | # CONFIG_NFSD_V4 is not set |
854 | CONFIG_ROOT_NFS=y | ||
855 | CONFIG_LOCKD=y | 858 | CONFIG_LOCKD=y |
856 | CONFIG_LOCKD_V4=y | 859 | CONFIG_LOCKD_V4=y |
857 | CONFIG_EXPORTFS=m | 860 | CONFIG_EXPORTFS=m |
858 | CONFIG_NFS_COMMON=y | 861 | CONFIG_NFS_COMMON=y |
859 | CONFIG_SUNRPC=y | 862 | CONFIG_SUNRPC=y |
860 | CONFIG_SUNRPC_GSS=y | 863 | CONFIG_SUNRPC_GSS=y |
861 | CONFIG_SUNRPC_BIND34=y | ||
862 | CONFIG_RPCSEC_GSS_KRB5=y | 864 | CONFIG_RPCSEC_GSS_KRB5=y |
863 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 865 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
864 | CONFIG_SMB_FS=m | 866 | CONFIG_SMB_FS=m |
@@ -867,7 +869,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
867 | # CONFIG_CIFS is not set | 869 | # CONFIG_CIFS is not set |
868 | # CONFIG_NCP_FS is not set | 870 | # CONFIG_NCP_FS is not set |
869 | CONFIG_CODA_FS=m | 871 | CONFIG_CODA_FS=m |
870 | # CONFIG_CODA_FS_OLD_API is not set | ||
871 | # CONFIG_AFS_FS is not set | 872 | # CONFIG_AFS_FS is not set |
872 | 873 | ||
873 | # | 874 | # |
@@ -932,6 +933,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
932 | # CONFIG_HEADERS_CHECK is not set | 933 | # CONFIG_HEADERS_CHECK is not set |
933 | # CONFIG_DEBUG_KERNEL is not set | 934 | # CONFIG_DEBUG_KERNEL is not set |
934 | CONFIG_DEBUG_BUGVERBOSE=y | 935 | CONFIG_DEBUG_BUGVERBOSE=y |
936 | CONFIG_DEBUG_MEMORY_INIT=y | ||
937 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
935 | # CONFIG_SAMPLES is not set | 938 | # CONFIG_SAMPLES is not set |
936 | 939 | ||
937 | # | 940 | # |
@@ -991,6 +994,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
991 | CONFIG_CRYPTO_MD4=m | 994 | CONFIG_CRYPTO_MD4=m |
992 | CONFIG_CRYPTO_MD5=y | 995 | CONFIG_CRYPTO_MD5=y |
993 | CONFIG_CRYPTO_MICHAEL_MIC=m | 996 | CONFIG_CRYPTO_MICHAEL_MIC=m |
997 | CONFIG_CRYPTO_RMD128=m | ||
998 | CONFIG_CRYPTO_RMD160=m | ||
999 | CONFIG_CRYPTO_RMD256=m | ||
1000 | CONFIG_CRYPTO_RMD320=m | ||
994 | CONFIG_CRYPTO_SHA1=m | 1001 | CONFIG_CRYPTO_SHA1=m |
995 | CONFIG_CRYPTO_SHA256=m | 1002 | CONFIG_CRYPTO_SHA256=m |
996 | CONFIG_CRYPTO_SHA512=m | 1003 | CONFIG_CRYPTO_SHA512=m |
@@ -1032,6 +1039,7 @@ CONFIG_BITREVERSE=y | |||
1032 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1039 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
1033 | CONFIG_CRC_CCITT=m | 1040 | CONFIG_CRC_CCITT=m |
1034 | CONFIG_CRC16=m | 1041 | CONFIG_CRC16=m |
1042 | CONFIG_CRC_T10DIF=y | ||
1035 | CONFIG_CRC_ITU_T=m | 1043 | CONFIG_CRC_ITU_T=m |
1036 | CONFIG_CRC32=y | 1044 | CONFIG_CRC32=y |
1037 | # CONFIG_CRC7 is not set | 1045 | # CONFIG_CRC7 is not set |