diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2005-04-18 13:47:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 13:47:33 -0400 |
commit | 4575ceb1d31d9fabc2314410f1645748284c95a9 (patch) | |
tree | c80f49b7b8305bb4cb37aee6b683931a4fb36c91 /arch/m68k/configs/apollo_defconfig | |
parent | 15e8869943060780b79b242851b0692286fc7d18 (diff) |
[PATCH] M68k: Update defconfigs for 2.6.11
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 648361b544c0..ade3028cd992 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -1,12 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.10-m68k | 3 | # Linux kernel version: 2.6.11-m68k |
4 | # Sun Dec 26 11:22:58 2004 | 4 | # Wed Mar 2 15:28:01 2005 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | 8 | CONFIG_UID16=y |
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
10 | 11 | ||
11 | # | 12 | # |
12 | # Code maturity level options | 13 | # Code maturity level options |
@@ -27,7 +28,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
27 | CONFIG_SYSCTL=y | 28 | CONFIG_SYSCTL=y |
28 | CONFIG_AUDIT=y | 29 | CONFIG_AUDIT=y |
29 | CONFIG_LOG_BUF_SHIFT=16 | 30 | CONFIG_LOG_BUF_SHIFT=16 |
30 | # CONFIG_HOTPLUG is not set | 31 | CONFIG_HOTPLUG=y |
31 | CONFIG_KOBJECT_UEVENT=y | 32 | CONFIG_KOBJECT_UEVENT=y |
32 | # CONFIG_IKCONFIG is not set | 33 | # CONFIG_IKCONFIG is not set |
33 | # CONFIG_EMBEDDED is not set | 34 | # CONFIG_EMBEDDED is not set |
@@ -99,6 +100,7 @@ CONFIG_PROC_HARDWARE=y | |||
99 | # | 100 | # |
100 | CONFIG_STANDALONE=y | 101 | CONFIG_STANDALONE=y |
101 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 102 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
103 | CONFIG_FW_LOADER=m | ||
102 | # CONFIG_DEBUG_DRIVER is not set | 104 | # CONFIG_DEBUG_DRIVER is not set |
103 | 105 | ||
104 | # | 106 | # |
@@ -118,6 +120,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
118 | # | 120 | # |
119 | # Block devices | 121 | # Block devices |
120 | # | 122 | # |
123 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
121 | CONFIG_BLK_DEV_LOOP=y | 124 | CONFIG_BLK_DEV_LOOP=y |
122 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 125 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
123 | CONFIG_BLK_DEV_NBD=m | 126 | CONFIG_BLK_DEV_NBD=m |
@@ -137,6 +140,7 @@ CONFIG_IOSCHED_NOOP=y | |||
137 | CONFIG_IOSCHED_AS=y | 140 | CONFIG_IOSCHED_AS=y |
138 | CONFIG_IOSCHED_DEADLINE=y | 141 | CONFIG_IOSCHED_DEADLINE=y |
139 | CONFIG_IOSCHED_CFQ=y | 142 | CONFIG_IOSCHED_CFQ=y |
143 | CONFIG_ATA_OVER_ETH=m | ||
140 | 144 | ||
141 | # | 145 | # |
142 | # ATA/ATAPI/MFM/RLL support | 146 | # ATA/ATAPI/MFM/RLL support |
@@ -171,6 +175,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
171 | # | 175 | # |
172 | # CONFIG_SCSI_SPI_ATTRS is not set | 176 | # CONFIG_SCSI_SPI_ATTRS is not set |
173 | # CONFIG_SCSI_FC_ATTRS is not set | 177 | # CONFIG_SCSI_FC_ATTRS is not set |
178 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
174 | 179 | ||
175 | # | 180 | # |
176 | # SCSI low-level drivers | 181 | # SCSI low-level drivers |
@@ -320,8 +325,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
320 | CONFIG_IP_NF_ARPTABLES=m | 325 | CONFIG_IP_NF_ARPTABLES=m |
321 | CONFIG_IP_NF_ARPFILTER=m | 326 | CONFIG_IP_NF_ARPFILTER=m |
322 | CONFIG_IP_NF_ARP_MANGLE=m | 327 | CONFIG_IP_NF_ARP_MANGLE=m |
323 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
324 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
325 | 328 | ||
326 | # | 329 | # |
327 | # IPv6: Netfilter Configuration | 330 | # IPv6: Netfilter Configuration |
@@ -476,6 +479,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
476 | CONFIG_SERIO=m | 479 | CONFIG_SERIO=m |
477 | CONFIG_SERIO_SERPORT=m | 480 | CONFIG_SERIO_SERPORT=m |
478 | # CONFIG_SERIO_CT82C710 is not set | 481 | # CONFIG_SERIO_CT82C710 is not set |
482 | CONFIG_SERIO_LIBPS2=m | ||
479 | # CONFIG_SERIO_RAW is not set | 483 | # CONFIG_SERIO_RAW is not set |
480 | 484 | ||
481 | # | 485 | # |
@@ -595,6 +599,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
595 | # CONFIG_MMC is not set | 599 | # CONFIG_MMC is not set |
596 | 600 | ||
597 | # | 601 | # |
602 | # InfiniBand support | ||
603 | # | ||
604 | # CONFIG_INFINIBAND is not set | ||
605 | |||
606 | # | ||
598 | # Character devices | 607 | # Character devices |
599 | # | 608 | # |
600 | CONFIG_DN_SERIAL=y | 609 | CONFIG_DN_SERIAL=y |
@@ -615,10 +624,16 @@ CONFIG_REISERFS_FS=m | |||
615 | # CONFIG_REISERFS_FS_XATTR is not set | 624 | # CONFIG_REISERFS_FS_XATTR is not set |
616 | CONFIG_JFS_FS=m | 625 | CONFIG_JFS_FS=m |
617 | # CONFIG_JFS_POSIX_ACL is not set | 626 | # CONFIG_JFS_POSIX_ACL is not set |
627 | # CONFIG_JFS_SECURITY is not set | ||
618 | # CONFIG_JFS_DEBUG is not set | 628 | # CONFIG_JFS_DEBUG is not set |
619 | # CONFIG_JFS_STATISTICS is not set | 629 | # CONFIG_JFS_STATISTICS is not set |
620 | CONFIG_FS_POSIX_ACL=y | 630 | CONFIG_FS_POSIX_ACL=y |
631 | |||
632 | # | ||
633 | # XFS support | ||
634 | # | ||
621 | CONFIG_XFS_FS=m | 635 | CONFIG_XFS_FS=m |
636 | CONFIG_XFS_EXPORT=y | ||
622 | # CONFIG_XFS_RT is not set | 637 | # CONFIG_XFS_RT is not set |
623 | # CONFIG_XFS_QUOTA is not set | 638 | # CONFIG_XFS_QUOTA is not set |
624 | # CONFIG_XFS_SECURITY is not set | 639 | # CONFIG_XFS_SECURITY is not set |
@@ -778,8 +793,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
778 | # CONFIG_SCHEDSTATS is not set | 793 | # CONFIG_SCHEDSTATS is not set |
779 | # CONFIG_DEBUG_SLAB is not set | 794 | # CONFIG_DEBUG_SLAB is not set |
780 | # CONFIG_DEBUG_KOBJECT is not set | 795 | # CONFIG_DEBUG_KOBJECT is not set |
781 | # CONFIG_DEBUG_BUGVERBOSE is not set | 796 | CONFIG_DEBUG_BUGVERBOSE=y |
782 | # CONFIG_DEBUG_INFO is not set | 797 | # CONFIG_DEBUG_INFO is not set |
798 | # CONFIG_DEBUG_FS is not set | ||
783 | 799 | ||
784 | # | 800 | # |
785 | # Security options | 801 | # Security options |
@@ -816,6 +832,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
816 | CONFIG_CRYPTO_TEST=m | 832 | CONFIG_CRYPTO_TEST=m |
817 | 833 | ||
818 | # | 834 | # |
835 | # Hardware crypto devices | ||
836 | # | ||
837 | |||
838 | # | ||
819 | # Library routines | 839 | # Library routines |
820 | # | 840 | # |
821 | CONFIG_CRC_CCITT=m | 841 | CONFIG_CRC_CCITT=m |