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/mvme147_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/mvme147_defconfig')
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index e7a8246840b5..cacb5aef6a37 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_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:08 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 |
@@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m | |||
163 | CONFIG_PROC_HARDWARE=y | 169 | CONFIG_PROC_HARDWARE=y |
164 | CONFIG_ZONE_DMA=y | 170 | CONFIG_ZONE_DMA=y |
165 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 171 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
166 | |||
167 | # | ||
168 | # Networking | ||
169 | # | ||
170 | CONFIG_NET=y | 172 | CONFIG_NET=y |
171 | 173 | ||
172 | # | 174 | # |
@@ -180,6 +182,7 @@ CONFIG_XFRM=y | |||
180 | # CONFIG_XFRM_SUB_POLICY is not set | 182 | # CONFIG_XFRM_SUB_POLICY is not set |
181 | CONFIG_XFRM_MIGRATE=y | 183 | CONFIG_XFRM_MIGRATE=y |
182 | # CONFIG_XFRM_STATISTICS is not set | 184 | # CONFIG_XFRM_STATISTICS is not set |
185 | CONFIG_XFRM_IPCOMP=m | ||
183 | CONFIG_NET_KEY=y | 186 | CONFIG_NET_KEY=y |
184 | CONFIG_NET_KEY_MIGRATE=y | 187 | CONFIG_NET_KEY_MIGRATE=y |
185 | CONFIG_INET=y | 188 | CONFIG_INET=y |
@@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
413 | # | 416 | # |
414 | # CONFIG_CFG80211 is not set | 417 | # CONFIG_CFG80211 is not set |
415 | CONFIG_WIRELESS_EXT=y | 418 | CONFIG_WIRELESS_EXT=y |
419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
416 | # CONFIG_MAC80211 is not set | 420 | # CONFIG_MAC80211 is not set |
417 | CONFIG_IEEE80211=m | 421 | CONFIG_IEEE80211=m |
418 | # CONFIG_IEEE80211_DEBUG is not set | 422 | # CONFIG_IEEE80211_DEBUG is not set |
@@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
433 | CONFIG_STANDALONE=y | 437 | CONFIG_STANDALONE=y |
434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 438 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
435 | CONFIG_FW_LOADER=m | 439 | CONFIG_FW_LOADER=y |
440 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
441 | CONFIG_EXTRA_FIRMWARE="" | ||
436 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
437 | CONFIG_CONNECTOR=m | 443 | CONFIG_CONNECTOR=m |
438 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
@@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
450 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 456 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
451 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 457 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
452 | CONFIG_ATA_OVER_ETH=m | 458 | CONFIG_ATA_OVER_ETH=m |
459 | # CONFIG_BLK_DEV_HD is not set | ||
453 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
454 | # CONFIG_EEPROM_93CX6 is not set | 461 | # CONFIG_EEPROM_93CX6 is not set |
455 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -502,6 +509,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
502 | CONFIG_ISCSI_TCP=m | 509 | CONFIG_ISCSI_TCP=m |
503 | # CONFIG_SCSI_DEBUG is not set | 510 | # CONFIG_SCSI_DEBUG is not set |
504 | CONFIG_MVME147_SCSI=y | 511 | CONFIG_MVME147_SCSI=y |
512 | # CONFIG_SCSI_DH is not set | ||
505 | CONFIG_MD=y | 513 | CONFIG_MD=y |
506 | CONFIG_BLK_DEV_MD=m | 514 | CONFIG_BLK_DEV_MD=m |
507 | CONFIG_MD_LINEAR=m | 515 | CONFIG_MD_LINEAR=m |
@@ -510,7 +518,7 @@ CONFIG_MD_RAID1=m | |||
510 | # CONFIG_MD_RAID10 is not set | 518 | # CONFIG_MD_RAID10 is not set |
511 | CONFIG_MD_RAID456=m | 519 | CONFIG_MD_RAID456=m |
512 | CONFIG_MD_RAID5_RESHAPE=y | 520 | CONFIG_MD_RAID5_RESHAPE=y |
513 | CONFIG_MD_MULTIPATH=m | 521 | # CONFIG_MD_MULTIPATH is not set |
514 | # CONFIG_MD_FAULTY is not set | 522 | # CONFIG_MD_FAULTY is not set |
515 | CONFIG_BLK_DEV_DM=m | 523 | CONFIG_BLK_DEV_DM=m |
516 | # CONFIG_DM_DEBUG is not set | 524 | # CONFIG_DM_DEBUG is not set |
@@ -519,13 +527,9 @@ CONFIG_DM_SNAPSHOT=m | |||
519 | CONFIG_DM_MIRROR=m | 527 | CONFIG_DM_MIRROR=m |
520 | CONFIG_DM_ZERO=m | 528 | CONFIG_DM_ZERO=m |
521 | CONFIG_DM_MULTIPATH=m | 529 | CONFIG_DM_MULTIPATH=m |
522 | CONFIG_DM_MULTIPATH_EMC=m | ||
523 | CONFIG_DM_MULTIPATH_RDAC=m | ||
524 | CONFIG_DM_MULTIPATH_HP=m | ||
525 | # CONFIG_DM_DELAY is not set | 530 | # CONFIG_DM_DELAY is not set |
526 | CONFIG_DM_UEVENT=y | 531 | CONFIG_DM_UEVENT=y |
527 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
528 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
529 | CONFIG_DUMMY=m | 533 | CONFIG_DUMMY=m |
530 | # CONFIG_BONDING is not set | 534 | # CONFIG_BONDING is not set |
531 | CONFIG_MACVLAN=m | 535 | CONFIG_MACVLAN=m |
@@ -630,6 +634,7 @@ CONFIG_SERIO_LIBPS2=m | |||
630 | # Character devices | 634 | # Character devices |
631 | # | 635 | # |
632 | CONFIG_VT=y | 636 | CONFIG_VT=y |
637 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
633 | CONFIG_VT_CONSOLE=y | 638 | CONFIG_VT_CONSOLE=y |
634 | CONFIG_HW_CONSOLE=y | 639 | CONFIG_HW_CONSOLE=y |
635 | CONFIG_VT_HW_CONSOLE_BINDING=y | 640 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -660,6 +665,7 @@ CONFIG_GEN_RTC_X=y | |||
660 | # CONFIG_POWER_SUPPLY is not set | 665 | # CONFIG_POWER_SUPPLY is not set |
661 | # CONFIG_HWMON is not set | 666 | # CONFIG_HWMON is not set |
662 | # CONFIG_THERMAL is not set | 667 | # CONFIG_THERMAL is not set |
668 | # CONFIG_THERMAL_HWMON is not set | ||
663 | # CONFIG_WATCHDOG is not set | 669 | # CONFIG_WATCHDOG is not set |
664 | 670 | ||
665 | # | 671 | # |
@@ -671,8 +677,10 @@ CONFIG_SSB_POSSIBLE=y | |||
671 | # | 677 | # |
672 | # Multifunction device drivers | 678 | # Multifunction device drivers |
673 | # | 679 | # |
680 | # CONFIG_MFD_CORE is not set | ||
674 | # CONFIG_MFD_SM501 is not set | 681 | # CONFIG_MFD_SM501 is not set |
675 | # CONFIG_HTC_PASIC3 is not set | 682 | # CONFIG_HTC_PASIC3 is not set |
683 | # CONFIG_MFD_TMIO is not set | ||
676 | 684 | ||
677 | # | 685 | # |
678 | # Multimedia devices | 686 | # Multimedia devices |
@@ -707,10 +715,6 @@ CONFIG_SSB_POSSIBLE=y | |||
707 | # Console display driver support | 715 | # Console display driver support |
708 | # | 716 | # |
709 | CONFIG_DUMMY_CONSOLE=y | 717 | CONFIG_DUMMY_CONSOLE=y |
710 | |||
711 | # | ||
712 | # Sound | ||
713 | # | ||
714 | # CONFIG_SOUND is not set | 718 | # CONFIG_SOUND is not set |
715 | CONFIG_HID_SUPPORT=y | 719 | CONFIG_HID_SUPPORT=y |
716 | CONFIG_HID=m | 720 | CONFIG_HID=m |
@@ -722,6 +726,7 @@ CONFIG_HIDRAW=y | |||
722 | # CONFIG_NEW_LEDS is not set | 726 | # CONFIG_NEW_LEDS is not set |
723 | # CONFIG_ACCESSIBILITY is not set | 727 | # CONFIG_ACCESSIBILITY is not set |
724 | # CONFIG_RTC_CLASS is not set | 728 | # CONFIG_RTC_CLASS is not set |
729 | # CONFIG_DMADEVICES is not set | ||
725 | # CONFIG_UIO is not set | 730 | # CONFIG_UIO is not set |
726 | 731 | ||
727 | # | 732 | # |
@@ -758,6 +763,7 @@ CONFIG_XFS_FS=m | |||
758 | CONFIG_OCFS2_FS=m | 763 | CONFIG_OCFS2_FS=m |
759 | CONFIG_OCFS2_FS_O2CB=m | 764 | CONFIG_OCFS2_FS_O2CB=m |
760 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 765 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
766 | # CONFIG_OCFS2_FS_STATS is not set | ||
761 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 767 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
762 | # CONFIG_OCFS2_DEBUG_FS is not set | 768 | # CONFIG_OCFS2_DEBUG_FS is not set |
763 | CONFIG_DNOTIFY=y | 769 | CONFIG_DNOTIFY=y |
@@ -817,6 +823,7 @@ CONFIG_HFSPLUS_FS=m | |||
817 | CONFIG_CRAMFS=m | 823 | CONFIG_CRAMFS=m |
818 | # CONFIG_VXFS_FS is not set | 824 | # CONFIG_VXFS_FS is not set |
819 | CONFIG_MINIX_FS=y | 825 | CONFIG_MINIX_FS=y |
826 | # CONFIG_OMFS_FS is not set | ||
820 | CONFIG_HPFS_FS=m | 827 | CONFIG_HPFS_FS=m |
821 | # CONFIG_QNX4FS_FS is not set | 828 | # CONFIG_QNX4FS_FS is not set |
822 | # CONFIG_ROMFS_FS is not set | 829 | # CONFIG_ROMFS_FS is not set |
@@ -829,18 +836,17 @@ CONFIG_NFS_FS=y | |||
829 | CONFIG_NFS_V3=y | 836 | CONFIG_NFS_V3=y |
830 | # CONFIG_NFS_V3_ACL is not set | 837 | # CONFIG_NFS_V3_ACL is not set |
831 | CONFIG_NFS_V4=y | 838 | CONFIG_NFS_V4=y |
839 | CONFIG_ROOT_NFS=y | ||
832 | CONFIG_NFSD=m | 840 | CONFIG_NFSD=m |
833 | CONFIG_NFSD_V3=y | 841 | CONFIG_NFSD_V3=y |
834 | # CONFIG_NFSD_V3_ACL is not set | 842 | # CONFIG_NFSD_V3_ACL is not set |
835 | # CONFIG_NFSD_V4 is not set | 843 | # CONFIG_NFSD_V4 is not set |
836 | CONFIG_ROOT_NFS=y | ||
837 | CONFIG_LOCKD=y | 844 | CONFIG_LOCKD=y |
838 | CONFIG_LOCKD_V4=y | 845 | CONFIG_LOCKD_V4=y |
839 | CONFIG_EXPORTFS=m | 846 | CONFIG_EXPORTFS=m |
840 | CONFIG_NFS_COMMON=y | 847 | CONFIG_NFS_COMMON=y |
841 | CONFIG_SUNRPC=y | 848 | CONFIG_SUNRPC=y |
842 | CONFIG_SUNRPC_GSS=y | 849 | CONFIG_SUNRPC_GSS=y |
843 | CONFIG_SUNRPC_BIND34=y | ||
844 | CONFIG_RPCSEC_GSS_KRB5=y | 850 | CONFIG_RPCSEC_GSS_KRB5=y |
845 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
846 | CONFIG_SMB_FS=m | 852 | CONFIG_SMB_FS=m |
@@ -849,7 +855,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
849 | # CONFIG_CIFS is not set | 855 | # CONFIG_CIFS is not set |
850 | # CONFIG_NCP_FS is not set | 856 | # CONFIG_NCP_FS is not set |
851 | CONFIG_CODA_FS=m | 857 | CONFIG_CODA_FS=m |
852 | # CONFIG_CODA_FS_OLD_API is not set | ||
853 | # CONFIG_AFS_FS is not set | 858 | # CONFIG_AFS_FS is not set |
854 | 859 | ||
855 | # | 860 | # |
@@ -914,6 +919,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
914 | # CONFIG_HEADERS_CHECK is not set | 919 | # CONFIG_HEADERS_CHECK is not set |
915 | # CONFIG_DEBUG_KERNEL is not set | 920 | # CONFIG_DEBUG_KERNEL is not set |
916 | CONFIG_DEBUG_BUGVERBOSE=y | 921 | CONFIG_DEBUG_BUGVERBOSE=y |
922 | CONFIG_DEBUG_MEMORY_INIT=y | ||
923 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
917 | # CONFIG_SAMPLES is not set | 924 | # CONFIG_SAMPLES is not set |
918 | 925 | ||
919 | # | 926 | # |
@@ -973,6 +980,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
973 | CONFIG_CRYPTO_MD4=m | 980 | CONFIG_CRYPTO_MD4=m |
974 | CONFIG_CRYPTO_MD5=y | 981 | CONFIG_CRYPTO_MD5=y |
975 | CONFIG_CRYPTO_MICHAEL_MIC=m | 982 | CONFIG_CRYPTO_MICHAEL_MIC=m |
983 | CONFIG_CRYPTO_RMD128=m | ||
984 | CONFIG_CRYPTO_RMD160=m | ||
985 | CONFIG_CRYPTO_RMD256=m | ||
986 | CONFIG_CRYPTO_RMD320=m | ||
976 | CONFIG_CRYPTO_SHA1=m | 987 | CONFIG_CRYPTO_SHA1=m |
977 | CONFIG_CRYPTO_SHA256=m | 988 | CONFIG_CRYPTO_SHA256=m |
978 | CONFIG_CRYPTO_SHA512=m | 989 | CONFIG_CRYPTO_SHA512=m |
@@ -1014,6 +1025,7 @@ CONFIG_BITREVERSE=y | |||
1014 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1025 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
1015 | CONFIG_CRC_CCITT=m | 1026 | CONFIG_CRC_CCITT=m |
1016 | CONFIG_CRC16=m | 1027 | CONFIG_CRC16=m |
1028 | CONFIG_CRC_T10DIF=y | ||
1017 | CONFIG_CRC_ITU_T=m | 1029 | CONFIG_CRC_ITU_T=m |
1018 | CONFIG_CRC32=y | 1030 | CONFIG_CRC32=y |
1019 | # CONFIG_CRC7 is not set | 1031 | # CONFIG_CRC7 is not set |