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/sun3x_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/sun3x_defconfig')
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 8d3a416c92bf..04b4363a7050 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_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:12 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 |
@@ -160,10 +166,6 @@ CONFIG_BINFMT_MISC=m | |||
160 | CONFIG_PROC_HARDWARE=y | 166 | CONFIG_PROC_HARDWARE=y |
161 | CONFIG_ZONE_DMA=y | 167 | CONFIG_ZONE_DMA=y |
162 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 168 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
163 | |||
164 | # | ||
165 | # Networking | ||
166 | # | ||
167 | CONFIG_NET=y | 169 | CONFIG_NET=y |
168 | 170 | ||
169 | # | 171 | # |
@@ -177,6 +179,7 @@ CONFIG_XFRM=y | |||
177 | # CONFIG_XFRM_SUB_POLICY is not set | 179 | # CONFIG_XFRM_SUB_POLICY is not set |
178 | CONFIG_XFRM_MIGRATE=y | 180 | CONFIG_XFRM_MIGRATE=y |
179 | # CONFIG_XFRM_STATISTICS is not set | 181 | # CONFIG_XFRM_STATISTICS is not set |
182 | CONFIG_XFRM_IPCOMP=m | ||
180 | CONFIG_NET_KEY=y | 183 | CONFIG_NET_KEY=y |
181 | CONFIG_NET_KEY_MIGRATE=y | 184 | CONFIG_NET_KEY_MIGRATE=y |
182 | CONFIG_INET=y | 185 | CONFIG_INET=y |
@@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
410 | # | 413 | # |
411 | # CONFIG_CFG80211 is not set | 414 | # CONFIG_CFG80211 is not set |
412 | CONFIG_WIRELESS_EXT=y | 415 | CONFIG_WIRELESS_EXT=y |
416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
413 | # CONFIG_MAC80211 is not set | 417 | # CONFIG_MAC80211 is not set |
414 | CONFIG_IEEE80211=m | 418 | CONFIG_IEEE80211=m |
415 | # CONFIG_IEEE80211_DEBUG is not set | 419 | # CONFIG_IEEE80211_DEBUG is not set |
@@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
429 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 433 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
430 | CONFIG_STANDALONE=y | 434 | CONFIG_STANDALONE=y |
431 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 435 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
432 | CONFIG_FW_LOADER=m | 436 | CONFIG_FW_LOADER=y |
437 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
438 | CONFIG_EXTRA_FIRMWARE="" | ||
433 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
434 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
435 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
@@ -447,6 +453,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
447 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 453 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
448 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 454 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
449 | CONFIG_ATA_OVER_ETH=m | 455 | CONFIG_ATA_OVER_ETH=m |
456 | # CONFIG_BLK_DEV_HD is not set | ||
450 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
451 | # CONFIG_EEPROM_93CX6 is not set | 458 | # CONFIG_EEPROM_93CX6 is not set |
452 | # CONFIG_ENCLOSURE_SERVICES is not set | 459 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -499,6 +506,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
499 | CONFIG_ISCSI_TCP=m | 506 | CONFIG_ISCSI_TCP=m |
500 | # CONFIG_SCSI_DEBUG is not set | 507 | # CONFIG_SCSI_DEBUG is not set |
501 | CONFIG_SUN3X_ESP=y | 508 | CONFIG_SUN3X_ESP=y |
509 | # CONFIG_SCSI_DH is not set | ||
502 | CONFIG_MD=y | 510 | CONFIG_MD=y |
503 | CONFIG_BLK_DEV_MD=m | 511 | CONFIG_BLK_DEV_MD=m |
504 | CONFIG_MD_LINEAR=m | 512 | CONFIG_MD_LINEAR=m |
@@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m | |||
507 | # CONFIG_MD_RAID10 is not set | 515 | # CONFIG_MD_RAID10 is not set |
508 | CONFIG_MD_RAID456=m | 516 | CONFIG_MD_RAID456=m |
509 | CONFIG_MD_RAID5_RESHAPE=y | 517 | CONFIG_MD_RAID5_RESHAPE=y |
510 | CONFIG_MD_MULTIPATH=m | 518 | # CONFIG_MD_MULTIPATH is not set |
511 | # CONFIG_MD_FAULTY is not set | 519 | # CONFIG_MD_FAULTY is not set |
512 | CONFIG_BLK_DEV_DM=m | 520 | CONFIG_BLK_DEV_DM=m |
513 | # CONFIG_DM_DEBUG is not set | 521 | # CONFIG_DM_DEBUG is not set |
@@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m | |||
516 | CONFIG_DM_MIRROR=m | 524 | CONFIG_DM_MIRROR=m |
517 | CONFIG_DM_ZERO=m | 525 | CONFIG_DM_ZERO=m |
518 | CONFIG_DM_MULTIPATH=m | 526 | CONFIG_DM_MULTIPATH=m |
519 | CONFIG_DM_MULTIPATH_EMC=m | ||
520 | CONFIG_DM_MULTIPATH_RDAC=m | ||
521 | CONFIG_DM_MULTIPATH_HP=m | ||
522 | # CONFIG_DM_DELAY is not set | 527 | # CONFIG_DM_DELAY is not set |
523 | CONFIG_DM_UEVENT=y | 528 | CONFIG_DM_UEVENT=y |
524 | CONFIG_NETDEVICES=y | 529 | CONFIG_NETDEVICES=y |
525 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
526 | CONFIG_DUMMY=m | 530 | CONFIG_DUMMY=m |
527 | # CONFIG_BONDING is not set | 531 | # CONFIG_BONDING is not set |
528 | CONFIG_MACVLAN=m | 532 | CONFIG_MACVLAN=m |
@@ -627,6 +631,7 @@ CONFIG_SERIO_LIBPS2=m | |||
627 | # Character devices | 631 | # Character devices |
628 | # | 632 | # |
629 | CONFIG_VT=y | 633 | CONFIG_VT=y |
634 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
630 | CONFIG_VT_CONSOLE=y | 635 | CONFIG_VT_CONSOLE=y |
631 | CONFIG_HW_CONSOLE=y | 636 | CONFIG_HW_CONSOLE=y |
632 | CONFIG_VT_HW_CONSOLE_BINDING=y | 637 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -657,6 +662,7 @@ CONFIG_GEN_RTC_X=y | |||
657 | # CONFIG_POWER_SUPPLY is not set | 662 | # CONFIG_POWER_SUPPLY is not set |
658 | # CONFIG_HWMON is not set | 663 | # CONFIG_HWMON is not set |
659 | # CONFIG_THERMAL is not set | 664 | # CONFIG_THERMAL is not set |
665 | # CONFIG_THERMAL_HWMON is not set | ||
660 | # CONFIG_WATCHDOG is not set | 666 | # CONFIG_WATCHDOG is not set |
661 | 667 | ||
662 | # | 668 | # |
@@ -668,8 +674,10 @@ CONFIG_SSB_POSSIBLE=y | |||
668 | # | 674 | # |
669 | # Multifunction device drivers | 675 | # Multifunction device drivers |
670 | # | 676 | # |
677 | # CONFIG_MFD_CORE is not set | ||
671 | # CONFIG_MFD_SM501 is not set | 678 | # CONFIG_MFD_SM501 is not set |
672 | # CONFIG_HTC_PASIC3 is not set | 679 | # CONFIG_HTC_PASIC3 is not set |
680 | # CONFIG_MFD_TMIO is not set | ||
673 | 681 | ||
674 | # | 682 | # |
675 | # Multimedia devices | 683 | # Multimedia devices |
@@ -737,10 +745,6 @@ CONFIG_LOGO=y | |||
737 | CONFIG_LOGO_LINUX_MONO=y | 745 | CONFIG_LOGO_LINUX_MONO=y |
738 | CONFIG_LOGO_LINUX_VGA16=y | 746 | CONFIG_LOGO_LINUX_VGA16=y |
739 | CONFIG_LOGO_LINUX_CLUT224=y | 747 | CONFIG_LOGO_LINUX_CLUT224=y |
740 | |||
741 | # | ||
742 | # Sound | ||
743 | # | ||
744 | # CONFIG_SOUND is not set | 748 | # CONFIG_SOUND is not set |
745 | CONFIG_HID_SUPPORT=y | 749 | CONFIG_HID_SUPPORT=y |
746 | CONFIG_HID=m | 750 | CONFIG_HID=m |
@@ -752,6 +756,7 @@ CONFIG_HIDRAW=y | |||
752 | # CONFIG_NEW_LEDS is not set | 756 | # CONFIG_NEW_LEDS is not set |
753 | # CONFIG_ACCESSIBILITY is not set | 757 | # CONFIG_ACCESSIBILITY is not set |
754 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
759 | # CONFIG_DMADEVICES is not set | ||
755 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
756 | 761 | ||
757 | # | 762 | # |
@@ -786,6 +791,7 @@ CONFIG_XFS_FS=m | |||
786 | CONFIG_OCFS2_FS=m | 791 | CONFIG_OCFS2_FS=m |
787 | CONFIG_OCFS2_FS_O2CB=m | 792 | CONFIG_OCFS2_FS_O2CB=m |
788 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 793 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
794 | # CONFIG_OCFS2_FS_STATS is not set | ||
789 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 795 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
790 | # CONFIG_OCFS2_DEBUG_FS is not set | 796 | # CONFIG_OCFS2_DEBUG_FS is not set |
791 | CONFIG_DNOTIFY=y | 797 | CONFIG_DNOTIFY=y |
@@ -845,6 +851,7 @@ CONFIG_HFSPLUS_FS=m | |||
845 | CONFIG_CRAMFS=m | 851 | CONFIG_CRAMFS=m |
846 | # CONFIG_VXFS_FS is not set | 852 | # CONFIG_VXFS_FS is not set |
847 | CONFIG_MINIX_FS=y | 853 | CONFIG_MINIX_FS=y |
854 | # CONFIG_OMFS_FS is not set | ||
848 | CONFIG_HPFS_FS=m | 855 | CONFIG_HPFS_FS=m |
849 | # CONFIG_QNX4FS_FS is not set | 856 | # CONFIG_QNX4FS_FS is not set |
850 | # CONFIG_ROMFS_FS is not set | 857 | # CONFIG_ROMFS_FS is not set |
@@ -857,18 +864,17 @@ CONFIG_NFS_FS=y | |||
857 | CONFIG_NFS_V3=y | 864 | CONFIG_NFS_V3=y |
858 | # CONFIG_NFS_V3_ACL is not set | 865 | # CONFIG_NFS_V3_ACL is not set |
859 | CONFIG_NFS_V4=y | 866 | CONFIG_NFS_V4=y |
867 | CONFIG_ROOT_NFS=y | ||
860 | CONFIG_NFSD=m | 868 | CONFIG_NFSD=m |
861 | CONFIG_NFSD_V3=y | 869 | CONFIG_NFSD_V3=y |
862 | # CONFIG_NFSD_V3_ACL is not set | 870 | # CONFIG_NFSD_V3_ACL is not set |
863 | # CONFIG_NFSD_V4 is not set | 871 | # CONFIG_NFSD_V4 is not set |
864 | CONFIG_ROOT_NFS=y | ||
865 | CONFIG_LOCKD=y | 872 | CONFIG_LOCKD=y |
866 | CONFIG_LOCKD_V4=y | 873 | CONFIG_LOCKD_V4=y |
867 | CONFIG_EXPORTFS=m | 874 | CONFIG_EXPORTFS=m |
868 | CONFIG_NFS_COMMON=y | 875 | CONFIG_NFS_COMMON=y |
869 | CONFIG_SUNRPC=y | 876 | CONFIG_SUNRPC=y |
870 | CONFIG_SUNRPC_GSS=y | 877 | CONFIG_SUNRPC_GSS=y |
871 | CONFIG_SUNRPC_BIND34=y | ||
872 | CONFIG_RPCSEC_GSS_KRB5=y | 878 | CONFIG_RPCSEC_GSS_KRB5=y |
873 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 879 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
874 | CONFIG_SMB_FS=m | 880 | CONFIG_SMB_FS=m |
@@ -877,7 +883,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
877 | # CONFIG_CIFS is not set | 883 | # CONFIG_CIFS is not set |
878 | # CONFIG_NCP_FS is not set | 884 | # CONFIG_NCP_FS is not set |
879 | CONFIG_CODA_FS=m | 885 | CONFIG_CODA_FS=m |
880 | # CONFIG_CODA_FS_OLD_API is not set | ||
881 | # CONFIG_AFS_FS is not set | 886 | # CONFIG_AFS_FS is not set |
882 | 887 | ||
883 | # | 888 | # |
@@ -942,6 +947,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
942 | # CONFIG_HEADERS_CHECK is not set | 947 | # CONFIG_HEADERS_CHECK is not set |
943 | # CONFIG_DEBUG_KERNEL is not set | 948 | # CONFIG_DEBUG_KERNEL is not set |
944 | CONFIG_DEBUG_BUGVERBOSE=y | 949 | CONFIG_DEBUG_BUGVERBOSE=y |
950 | CONFIG_DEBUG_MEMORY_INIT=y | ||
951 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
945 | # CONFIG_SAMPLES is not set | 952 | # CONFIG_SAMPLES is not set |
946 | 953 | ||
947 | # | 954 | # |
@@ -1001,6 +1008,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1001 | CONFIG_CRYPTO_MD4=m | 1008 | CONFIG_CRYPTO_MD4=m |
1002 | CONFIG_CRYPTO_MD5=y | 1009 | CONFIG_CRYPTO_MD5=y |
1003 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1010 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1011 | CONFIG_CRYPTO_RMD128=m | ||
1012 | CONFIG_CRYPTO_RMD160=m | ||
1013 | CONFIG_CRYPTO_RMD256=m | ||
1014 | CONFIG_CRYPTO_RMD320=m | ||
1004 | CONFIG_CRYPTO_SHA1=m | 1015 | CONFIG_CRYPTO_SHA1=m |
1005 | CONFIG_CRYPTO_SHA256=m | 1016 | CONFIG_CRYPTO_SHA256=m |
1006 | CONFIG_CRYPTO_SHA512=m | 1017 | CONFIG_CRYPTO_SHA512=m |
@@ -1042,6 +1053,7 @@ CONFIG_BITREVERSE=y | |||
1042 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1053 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
1043 | CONFIG_CRC_CCITT=m | 1054 | CONFIG_CRC_CCITT=m |
1044 | CONFIG_CRC16=m | 1055 | CONFIG_CRC16=m |
1056 | CONFIG_CRC_T10DIF=y | ||
1045 | CONFIG_CRC_ITU_T=m | 1057 | CONFIG_CRC_ITU_T=m |
1046 | CONFIG_CRC32=y | 1058 | CONFIG_CRC32=y |
1047 | # CONFIG_CRC7 is not set | 1059 | # CONFIG_CRC7 is not set |