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 | |
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>
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 32 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 32 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 32 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 32 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 33 | ||||
-rw-r--r-- | arch/m68k/defconfig | 26 |
12 files changed, 316 insertions, 69 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index c1b23336450b..4c26ea289d59 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_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:54 2004 | 4 | # Wed Mar 2 15:28:00 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 |
@@ -104,6 +105,7 @@ CONFIG_ZORRO_NAMES=y | |||
104 | # | 105 | # |
105 | CONFIG_STANDALONE=y | 106 | CONFIG_STANDALONE=y |
106 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 107 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
108 | CONFIG_FW_LOADER=m | ||
107 | # CONFIG_DEBUG_DRIVER is not set | 109 | # CONFIG_DEBUG_DRIVER is not set |
108 | 110 | ||
109 | # | 111 | # |
@@ -133,6 +135,7 @@ CONFIG_AMIGA_FLOPPY=y | |||
133 | CONFIG_AMIGA_Z2RAM=y | 135 | CONFIG_AMIGA_Z2RAM=y |
134 | # CONFIG_BLK_DEV_XD is not set | 136 | # CONFIG_BLK_DEV_XD is not set |
135 | # CONFIG_PARIDE is not set | 137 | # CONFIG_PARIDE is not set |
138 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
136 | CONFIG_BLK_DEV_LOOP=y | 139 | CONFIG_BLK_DEV_LOOP=y |
137 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 140 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
138 | CONFIG_BLK_DEV_NBD=m | 141 | CONFIG_BLK_DEV_NBD=m |
@@ -152,6 +155,7 @@ CONFIG_IOSCHED_NOOP=y | |||
152 | CONFIG_IOSCHED_AS=y | 155 | CONFIG_IOSCHED_AS=y |
153 | CONFIG_IOSCHED_DEADLINE=y | 156 | CONFIG_IOSCHED_DEADLINE=y |
154 | CONFIG_IOSCHED_CFQ=y | 157 | CONFIG_IOSCHED_CFQ=y |
158 | CONFIG_ATA_OVER_ETH=m | ||
155 | 159 | ||
156 | # | 160 | # |
157 | # ATA/ATAPI/MFM/RLL support | 161 | # ATA/ATAPI/MFM/RLL support |
@@ -212,6 +216,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
212 | # | 216 | # |
213 | # CONFIG_SCSI_SPI_ATTRS is not set | 217 | # CONFIG_SCSI_SPI_ATTRS is not set |
214 | # CONFIG_SCSI_FC_ATTRS is not set | 218 | # CONFIG_SCSI_FC_ATTRS is not set |
219 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
215 | 220 | ||
216 | # | 221 | # |
217 | # SCSI low-level drivers | 222 | # SCSI low-level drivers |
@@ -394,8 +399,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
394 | CONFIG_IP_NF_ARPTABLES=m | 399 | CONFIG_IP_NF_ARPTABLES=m |
395 | CONFIG_IP_NF_ARPFILTER=m | 400 | CONFIG_IP_NF_ARPFILTER=m |
396 | CONFIG_IP_NF_ARP_MANGLE=m | 401 | CONFIG_IP_NF_ARP_MANGLE=m |
397 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
398 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
399 | 402 | ||
400 | # | 403 | # |
401 | # IPv6: Netfilter Configuration | 404 | # IPv6: Netfilter Configuration |
@@ -707,6 +710,7 @@ CONFIG_LOGO=y | |||
707 | CONFIG_LOGO_LINUX_MONO=y | 710 | CONFIG_LOGO_LINUX_MONO=y |
708 | CONFIG_LOGO_LINUX_VGA16=y | 711 | CONFIG_LOGO_LINUX_VGA16=y |
709 | CONFIG_LOGO_LINUX_CLUT224=y | 712 | CONFIG_LOGO_LINUX_CLUT224=y |
713 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
710 | 714 | ||
711 | # | 715 | # |
712 | # Sound | 716 | # Sound |
@@ -736,6 +740,11 @@ CONFIG_DMASOUND=m | |||
736 | # CONFIG_MMC is not set | 740 | # CONFIG_MMC is not set |
737 | 741 | ||
738 | # | 742 | # |
743 | # InfiniBand support | ||
744 | # | ||
745 | # CONFIG_INFINIBAND is not set | ||
746 | |||
747 | # | ||
739 | # Character devices | 748 | # Character devices |
740 | # | 749 | # |
741 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 750 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
@@ -758,10 +767,16 @@ CONFIG_REISERFS_FS=m | |||
758 | # CONFIG_REISERFS_FS_XATTR is not set | 767 | # CONFIG_REISERFS_FS_XATTR is not set |
759 | CONFIG_JFS_FS=m | 768 | CONFIG_JFS_FS=m |
760 | # CONFIG_JFS_POSIX_ACL is not set | 769 | # CONFIG_JFS_POSIX_ACL is not set |
770 | # CONFIG_JFS_SECURITY is not set | ||
761 | # CONFIG_JFS_DEBUG is not set | 771 | # CONFIG_JFS_DEBUG is not set |
762 | # CONFIG_JFS_STATISTICS is not set | 772 | # CONFIG_JFS_STATISTICS is not set |
763 | CONFIG_FS_POSIX_ACL=y | 773 | CONFIG_FS_POSIX_ACL=y |
774 | |||
775 | # | ||
776 | # XFS support | ||
777 | # | ||
764 | CONFIG_XFS_FS=m | 778 | CONFIG_XFS_FS=m |
779 | CONFIG_XFS_EXPORT=y | ||
765 | # CONFIG_XFS_RT is not set | 780 | # CONFIG_XFS_RT is not set |
766 | # CONFIG_XFS_QUOTA is not set | 781 | # CONFIG_XFS_QUOTA is not set |
767 | # CONFIG_XFS_SECURITY is not set | 782 | # CONFIG_XFS_SECURITY is not set |
@@ -921,8 +936,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
921 | # CONFIG_SCHEDSTATS is not set | 936 | # CONFIG_SCHEDSTATS is not set |
922 | # CONFIG_DEBUG_SLAB is not set | 937 | # CONFIG_DEBUG_SLAB is not set |
923 | # CONFIG_DEBUG_KOBJECT is not set | 938 | # CONFIG_DEBUG_KOBJECT is not set |
924 | # CONFIG_DEBUG_BUGVERBOSE is not set | 939 | CONFIG_DEBUG_BUGVERBOSE=y |
925 | # CONFIG_DEBUG_INFO is not set | 940 | # CONFIG_DEBUG_INFO is not set |
941 | # CONFIG_DEBUG_FS is not set | ||
926 | 942 | ||
927 | # | 943 | # |
928 | # Security options | 944 | # Security options |
@@ -959,6 +975,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
959 | CONFIG_CRYPTO_TEST=m | 975 | CONFIG_CRYPTO_TEST=m |
960 | 976 | ||
961 | # | 977 | # |
978 | # Hardware crypto devices | ||
979 | # | ||
980 | |||
981 | # | ||
962 | # Library routines | 982 | # Library routines |
963 | # | 983 | # |
964 | CONFIG_CRC_CCITT=m | 984 | CONFIG_CRC_CCITT=m |
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 |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 1fb25c0b3e95..574c16ab7b66 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_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:23:11 2004 | 4 | # Wed Mar 2 15:28:03 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 |
@@ -100,6 +101,7 @@ CONFIG_PROC_HARDWARE=y | |||
100 | # | 101 | # |
101 | CONFIG_STANDALONE=y | 102 | CONFIG_STANDALONE=y |
102 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 103 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
104 | CONFIG_FW_LOADER=m | ||
103 | # CONFIG_DEBUG_DRIVER is not set | 105 | # CONFIG_DEBUG_DRIVER is not set |
104 | 106 | ||
105 | # | 107 | # |
@@ -125,6 +127,7 @@ CONFIG_PARPORT_1284=y | |||
125 | # | 127 | # |
126 | CONFIG_ATARI_FLOPPY=y | 128 | CONFIG_ATARI_FLOPPY=y |
127 | # CONFIG_PARIDE is not set | 129 | # CONFIG_PARIDE is not set |
130 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
128 | CONFIG_BLK_DEV_LOOP=y | 131 | CONFIG_BLK_DEV_LOOP=y |
129 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 132 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
130 | CONFIG_BLK_DEV_NBD=m | 133 | CONFIG_BLK_DEV_NBD=m |
@@ -144,6 +147,7 @@ CONFIG_IOSCHED_NOOP=y | |||
144 | CONFIG_IOSCHED_AS=y | 147 | CONFIG_IOSCHED_AS=y |
145 | CONFIG_IOSCHED_DEADLINE=y | 148 | CONFIG_IOSCHED_DEADLINE=y |
146 | CONFIG_IOSCHED_CFQ=y | 149 | CONFIG_IOSCHED_CFQ=y |
150 | CONFIG_ATA_OVER_ETH=m | ||
147 | 151 | ||
148 | # | 152 | # |
149 | # ATA/ATAPI/MFM/RLL support | 153 | # ATA/ATAPI/MFM/RLL support |
@@ -201,6 +205,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
201 | # | 205 | # |
202 | # CONFIG_SCSI_SPI_ATTRS is not set | 206 | # CONFIG_SCSI_SPI_ATTRS is not set |
203 | # CONFIG_SCSI_FC_ATTRS is not set | 207 | # CONFIG_SCSI_FC_ATTRS is not set |
208 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
204 | 209 | ||
205 | # | 210 | # |
206 | # SCSI low-level drivers | 211 | # SCSI low-level drivers |
@@ -349,8 +354,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
349 | CONFIG_IP_NF_ARPTABLES=m | 354 | CONFIG_IP_NF_ARPTABLES=m |
350 | CONFIG_IP_NF_ARPFILTER=m | 355 | CONFIG_IP_NF_ARPFILTER=m |
351 | CONFIG_IP_NF_ARP_MANGLE=m | 356 | CONFIG_IP_NF_ARP_MANGLE=m |
352 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
353 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
354 | 357 | ||
355 | # | 358 | # |
356 | # IPv6: Netfilter Configuration | 359 | # IPv6: Netfilter Configuration |
@@ -507,6 +510,7 @@ CONFIG_SERIO=y | |||
507 | CONFIG_SERIO_SERPORT=y | 510 | CONFIG_SERIO_SERPORT=y |
508 | # CONFIG_SERIO_CT82C710 is not set | 511 | # CONFIG_SERIO_CT82C710 is not set |
509 | # CONFIG_SERIO_PARKBD is not set | 512 | # CONFIG_SERIO_PARKBD is not set |
513 | CONFIG_SERIO_LIBPS2=y | ||
510 | # CONFIG_SERIO_RAW is not set | 514 | # CONFIG_SERIO_RAW is not set |
511 | 515 | ||
512 | # | 516 | # |
@@ -619,6 +623,7 @@ CONFIG_FONT_8x16=y | |||
619 | # Logo configuration | 623 | # Logo configuration |
620 | # | 624 | # |
621 | # CONFIG_LOGO is not set | 625 | # CONFIG_LOGO is not set |
626 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
622 | 627 | ||
623 | # | 628 | # |
624 | # Sound | 629 | # Sound |
@@ -648,6 +653,11 @@ CONFIG_DMASOUND=m | |||
648 | # CONFIG_MMC is not set | 653 | # CONFIG_MMC is not set |
649 | 654 | ||
650 | # | 655 | # |
656 | # InfiniBand support | ||
657 | # | ||
658 | # CONFIG_INFINIBAND is not set | ||
659 | |||
660 | # | ||
651 | # Character devices | 661 | # Character devices |
652 | # | 662 | # |
653 | CONFIG_ATARI_MFPSER=m | 663 | CONFIG_ATARI_MFPSER=m |
@@ -672,9 +682,15 @@ CONFIG_REISERFS_PROC_INFO=y | |||
672 | # CONFIG_REISERFS_FS_XATTR is not set | 682 | # CONFIG_REISERFS_FS_XATTR is not set |
673 | CONFIG_JFS_FS=m | 683 | CONFIG_JFS_FS=m |
674 | # CONFIG_JFS_POSIX_ACL is not set | 684 | # CONFIG_JFS_POSIX_ACL is not set |
685 | # CONFIG_JFS_SECURITY is not set | ||
675 | # CONFIG_JFS_DEBUG is not set | 686 | # CONFIG_JFS_DEBUG is not set |
676 | # CONFIG_JFS_STATISTICS is not set | 687 | # CONFIG_JFS_STATISTICS is not set |
688 | |||
689 | # | ||
690 | # XFS support | ||
691 | # | ||
677 | CONFIG_XFS_FS=m | 692 | CONFIG_XFS_FS=m |
693 | CONFIG_XFS_EXPORT=y | ||
678 | # CONFIG_XFS_RT is not set | 694 | # CONFIG_XFS_RT is not set |
679 | # CONFIG_XFS_QUOTA is not set | 695 | # CONFIG_XFS_QUOTA is not set |
680 | # CONFIG_XFS_SECURITY is not set | 696 | # CONFIG_XFS_SECURITY is not set |
@@ -833,8 +849,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
833 | # CONFIG_SCHEDSTATS is not set | 849 | # CONFIG_SCHEDSTATS is not set |
834 | # CONFIG_DEBUG_SLAB is not set | 850 | # CONFIG_DEBUG_SLAB is not set |
835 | # CONFIG_DEBUG_KOBJECT is not set | 851 | # CONFIG_DEBUG_KOBJECT is not set |
836 | # CONFIG_DEBUG_BUGVERBOSE is not set | 852 | CONFIG_DEBUG_BUGVERBOSE=y |
837 | # CONFIG_DEBUG_INFO is not set | 853 | # CONFIG_DEBUG_INFO is not set |
854 | # CONFIG_DEBUG_FS is not set | ||
838 | 855 | ||
839 | # | 856 | # |
840 | # Security options | 857 | # Security options |
@@ -871,6 +888,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
871 | CONFIG_CRYPTO_TEST=m | 888 | CONFIG_CRYPTO_TEST=m |
872 | 889 | ||
873 | # | 890 | # |
891 | # Hardware crypto devices | ||
892 | # | ||
893 | |||
894 | # | ||
874 | # Library routines | 895 | # Library routines |
875 | # | 896 | # |
876 | CONFIG_CRC_CCITT=m | 897 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index f1f2cf027100..37b30e42bd20 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_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:23:15 2004 | 4 | # Wed Mar 2 15:28:04 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 |
@@ -475,6 +478,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
475 | CONFIG_SERIO=m | 478 | CONFIG_SERIO=m |
476 | CONFIG_SERIO_SERPORT=m | 479 | CONFIG_SERIO_SERPORT=m |
477 | # CONFIG_SERIO_CT82C710 is not set | 480 | # CONFIG_SERIO_CT82C710 is not set |
481 | CONFIG_SERIO_LIBPS2=m | ||
478 | # CONFIG_SERIO_RAW is not set | 482 | # CONFIG_SERIO_RAW is not set |
479 | 483 | ||
480 | # | 484 | # |
@@ -594,6 +598,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
594 | # CONFIG_MMC is not set | 598 | # CONFIG_MMC is not set |
595 | 599 | ||
596 | # | 600 | # |
601 | # InfiniBand support | ||
602 | # | ||
603 | # CONFIG_INFINIBAND is not set | ||
604 | |||
605 | # | ||
597 | # Character devices | 606 | # Character devices |
598 | # | 607 | # |
599 | CONFIG_BVME6000_SCC=y | 608 | CONFIG_BVME6000_SCC=y |
@@ -614,10 +623,16 @@ CONFIG_REISERFS_FS=m | |||
614 | # CONFIG_REISERFS_FS_XATTR is not set | 623 | # CONFIG_REISERFS_FS_XATTR is not set |
615 | CONFIG_JFS_FS=m | 624 | CONFIG_JFS_FS=m |
616 | # CONFIG_JFS_POSIX_ACL is not set | 625 | # CONFIG_JFS_POSIX_ACL is not set |
626 | # CONFIG_JFS_SECURITY is not set | ||
617 | # CONFIG_JFS_DEBUG is not set | 627 | # CONFIG_JFS_DEBUG is not set |
618 | # CONFIG_JFS_STATISTICS is not set | 628 | # CONFIG_JFS_STATISTICS is not set |
619 | CONFIG_FS_POSIX_ACL=y | 629 | CONFIG_FS_POSIX_ACL=y |
630 | |||
631 | # | ||
632 | # XFS support | ||
633 | # | ||
620 | CONFIG_XFS_FS=m | 634 | CONFIG_XFS_FS=m |
635 | CONFIG_XFS_EXPORT=y | ||
621 | # CONFIG_XFS_RT is not set | 636 | # CONFIG_XFS_RT is not set |
622 | # CONFIG_XFS_QUOTA is not set | 637 | # CONFIG_XFS_QUOTA is not set |
623 | # CONFIG_XFS_SECURITY is not set | 638 | # CONFIG_XFS_SECURITY is not set |
@@ -777,8 +792,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
777 | # CONFIG_SCHEDSTATS is not set | 792 | # CONFIG_SCHEDSTATS is not set |
778 | # CONFIG_DEBUG_SLAB is not set | 793 | # CONFIG_DEBUG_SLAB is not set |
779 | # CONFIG_DEBUG_KOBJECT is not set | 794 | # CONFIG_DEBUG_KOBJECT is not set |
780 | # CONFIG_DEBUG_BUGVERBOSE is not set | 795 | CONFIG_DEBUG_BUGVERBOSE=y |
781 | # CONFIG_DEBUG_INFO is not set | 796 | # CONFIG_DEBUG_INFO is not set |
797 | # CONFIG_DEBUG_FS is not set | ||
782 | 798 | ||
783 | # | 799 | # |
784 | # Security options | 800 | # Security options |
@@ -815,6 +831,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
815 | CONFIG_CRYPTO_TEST=m | 831 | CONFIG_CRYPTO_TEST=m |
816 | 832 | ||
817 | # | 833 | # |
834 | # Hardware crypto devices | ||
835 | # | ||
836 | |||
837 | # | ||
818 | # Library routines | 838 | # Library routines |
819 | # | 839 | # |
820 | CONFIG_CRC_CCITT=m | 840 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 53dde43ddfcb..885e34d7d1ec 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_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:23:40 2004 | 4 | # Wed Mar 2 15:28:06 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 |
@@ -100,6 +101,7 @@ CONFIG_PROC_HARDWARE=y | |||
100 | # | 101 | # |
101 | CONFIG_STANDALONE=y | 102 | CONFIG_STANDALONE=y |
102 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 103 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
104 | CONFIG_FW_LOADER=m | ||
103 | # CONFIG_DEBUG_DRIVER is not set | 105 | # CONFIG_DEBUG_DRIVER is not set |
104 | 106 | ||
105 | # | 107 | # |
@@ -119,6 +121,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
119 | # | 121 | # |
120 | # Block devices | 122 | # Block devices |
121 | # | 123 | # |
124 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
122 | CONFIG_BLK_DEV_LOOP=y | 125 | CONFIG_BLK_DEV_LOOP=y |
123 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 126 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
124 | CONFIG_BLK_DEV_NBD=m | 127 | CONFIG_BLK_DEV_NBD=m |
@@ -138,6 +141,7 @@ CONFIG_IOSCHED_NOOP=y | |||
138 | CONFIG_IOSCHED_AS=y | 141 | CONFIG_IOSCHED_AS=y |
139 | CONFIG_IOSCHED_DEADLINE=y | 142 | CONFIG_IOSCHED_DEADLINE=y |
140 | CONFIG_IOSCHED_CFQ=y | 143 | CONFIG_IOSCHED_CFQ=y |
144 | CONFIG_ATA_OVER_ETH=m | ||
141 | 145 | ||
142 | # | 146 | # |
143 | # ATA/ATAPI/MFM/RLL support | 147 | # ATA/ATAPI/MFM/RLL support |
@@ -172,6 +176,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
172 | # | 176 | # |
173 | # CONFIG_SCSI_SPI_ATTRS is not set | 177 | # CONFIG_SCSI_SPI_ATTRS is not set |
174 | # CONFIG_SCSI_FC_ATTRS is not set | 178 | # CONFIG_SCSI_FC_ATTRS is not set |
179 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
175 | 180 | ||
176 | # | 181 | # |
177 | # SCSI low-level drivers | 182 | # SCSI low-level drivers |
@@ -321,8 +326,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
321 | CONFIG_IP_NF_ARPTABLES=m | 326 | CONFIG_IP_NF_ARPTABLES=m |
322 | CONFIG_IP_NF_ARPFILTER=m | 327 | CONFIG_IP_NF_ARPFILTER=m |
323 | CONFIG_IP_NF_ARP_MANGLE=m | 328 | CONFIG_IP_NF_ARP_MANGLE=m |
324 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
325 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
326 | 329 | ||
327 | # | 330 | # |
328 | # IPv6: Netfilter Configuration | 331 | # IPv6: Netfilter Configuration |
@@ -477,6 +480,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
477 | CONFIG_SERIO=m | 480 | CONFIG_SERIO=m |
478 | CONFIG_SERIO_SERPORT=m | 481 | CONFIG_SERIO_SERPORT=m |
479 | # CONFIG_SERIO_CT82C710 is not set | 482 | # CONFIG_SERIO_CT82C710 is not set |
483 | CONFIG_SERIO_LIBPS2=m | ||
480 | # CONFIG_SERIO_RAW is not set | 484 | # CONFIG_SERIO_RAW is not set |
481 | 485 | ||
482 | # | 486 | # |
@@ -596,6 +600,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
596 | # CONFIG_MMC is not set | 600 | # CONFIG_MMC is not set |
597 | 601 | ||
598 | # | 602 | # |
603 | # InfiniBand support | ||
604 | # | ||
605 | # CONFIG_INFINIBAND is not set | ||
606 | |||
607 | # | ||
599 | # Character devices | 608 | # Character devices |
600 | # | 609 | # |
601 | 610 | ||
@@ -614,10 +623,16 @@ CONFIG_REISERFS_FS=m | |||
614 | # CONFIG_REISERFS_FS_XATTR is not set | 623 | # CONFIG_REISERFS_FS_XATTR is not set |
615 | CONFIG_JFS_FS=m | 624 | CONFIG_JFS_FS=m |
616 | # CONFIG_JFS_POSIX_ACL is not set | 625 | # CONFIG_JFS_POSIX_ACL is not set |
626 | # CONFIG_JFS_SECURITY is not set | ||
617 | # CONFIG_JFS_DEBUG is not set | 627 | # CONFIG_JFS_DEBUG is not set |
618 | # CONFIG_JFS_STATISTICS is not set | 628 | # CONFIG_JFS_STATISTICS is not set |
619 | CONFIG_FS_POSIX_ACL=y | 629 | CONFIG_FS_POSIX_ACL=y |
630 | |||
631 | # | ||
632 | # XFS support | ||
633 | # | ||
620 | CONFIG_XFS_FS=m | 634 | CONFIG_XFS_FS=m |
635 | CONFIG_XFS_EXPORT=y | ||
621 | # CONFIG_XFS_RT is not set | 636 | # CONFIG_XFS_RT is not set |
622 | # CONFIG_XFS_QUOTA is not set | 637 | # CONFIG_XFS_QUOTA is not set |
623 | # CONFIG_XFS_SECURITY is not set | 638 | # CONFIG_XFS_SECURITY is not set |
@@ -777,8 +792,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
777 | # CONFIG_SCHEDSTATS is not set | 792 | # CONFIG_SCHEDSTATS is not set |
778 | # CONFIG_DEBUG_SLAB is not set | 793 | # CONFIG_DEBUG_SLAB is not set |
779 | # CONFIG_DEBUG_KOBJECT is not set | 794 | # CONFIG_DEBUG_KOBJECT is not set |
780 | # CONFIG_DEBUG_BUGVERBOSE is not set | 795 | CONFIG_DEBUG_BUGVERBOSE=y |
781 | # CONFIG_DEBUG_INFO is not set | 796 | # CONFIG_DEBUG_INFO is not set |
797 | # CONFIG_DEBUG_FS is not set | ||
782 | 798 | ||
783 | # | 799 | # |
784 | # Security options | 800 | # Security options |
@@ -815,6 +831,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
815 | CONFIG_CRYPTO_TEST=m | 831 | CONFIG_CRYPTO_TEST=m |
816 | 832 | ||
817 | # | 833 | # |
834 | # Hardware crypto devices | ||
835 | # | ||
836 | |||
837 | # | ||
818 | # Library routines | 838 | # Library routines |
819 | # | 839 | # |
820 | CONFIG_CRC_CCITT=m | 840 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 2452dac8db9d..e6f25cf483de 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_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:23:44 2004 | 4 | # Wed Mar 2 15:28:08 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 |
@@ -101,6 +102,7 @@ CONFIG_PROC_HARDWARE=y | |||
101 | # | 102 | # |
102 | CONFIG_STANDALONE=y | 103 | CONFIG_STANDALONE=y |
103 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 104 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
105 | CONFIG_FW_LOADER=m | ||
104 | # CONFIG_DEBUG_DRIVER is not set | 106 | # CONFIG_DEBUG_DRIVER is not set |
105 | 107 | ||
106 | # | 108 | # |
@@ -120,6 +122,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
120 | # | 122 | # |
121 | # Block devices | 123 | # Block devices |
122 | # | 124 | # |
125 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
123 | CONFIG_BLK_DEV_LOOP=y | 126 | CONFIG_BLK_DEV_LOOP=y |
124 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 127 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
125 | CONFIG_BLK_DEV_NBD=m | 128 | CONFIG_BLK_DEV_NBD=m |
@@ -139,6 +142,7 @@ CONFIG_IOSCHED_NOOP=y | |||
139 | CONFIG_IOSCHED_AS=y | 142 | CONFIG_IOSCHED_AS=y |
140 | CONFIG_IOSCHED_DEADLINE=y | 143 | CONFIG_IOSCHED_DEADLINE=y |
141 | CONFIG_IOSCHED_CFQ=y | 144 | CONFIG_IOSCHED_CFQ=y |
145 | CONFIG_ATA_OVER_ETH=m | ||
142 | 146 | ||
143 | # | 147 | # |
144 | # ATA/ATAPI/MFM/RLL support | 148 | # ATA/ATAPI/MFM/RLL support |
@@ -196,6 +200,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
196 | # | 200 | # |
197 | # CONFIG_SCSI_SPI_ATTRS is not set | 201 | # CONFIG_SCSI_SPI_ATTRS is not set |
198 | # CONFIG_SCSI_FC_ATTRS is not set | 202 | # CONFIG_SCSI_FC_ATTRS is not set |
203 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
199 | 204 | ||
200 | # | 205 | # |
201 | # SCSI low-level drivers | 206 | # SCSI low-level drivers |
@@ -356,8 +361,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
356 | CONFIG_IP_NF_ARPTABLES=m | 361 | CONFIG_IP_NF_ARPTABLES=m |
357 | CONFIG_IP_NF_ARPFILTER=m | 362 | CONFIG_IP_NF_ARPFILTER=m |
358 | CONFIG_IP_NF_ARP_MANGLE=m | 363 | CONFIG_IP_NF_ARP_MANGLE=m |
359 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
360 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
361 | 364 | ||
362 | # | 365 | # |
363 | # IPv6: Netfilter Configuration | 366 | # IPv6: Netfilter Configuration |
@@ -519,6 +522,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
519 | CONFIG_SERIO=m | 522 | CONFIG_SERIO=m |
520 | CONFIG_SERIO_SERPORT=m | 523 | CONFIG_SERIO_SERPORT=m |
521 | # CONFIG_SERIO_CT82C710 is not set | 524 | # CONFIG_SERIO_CT82C710 is not set |
525 | CONFIG_SERIO_LIBPS2=m | ||
522 | # CONFIG_SERIO_RAW is not set | 526 | # CONFIG_SERIO_RAW is not set |
523 | 527 | ||
524 | # | 528 | # |
@@ -630,6 +634,7 @@ CONFIG_LOGO_LINUX_MONO=y | |||
630 | CONFIG_LOGO_LINUX_VGA16=y | 634 | CONFIG_LOGO_LINUX_VGA16=y |
631 | CONFIG_LOGO_LINUX_CLUT224=y | 635 | CONFIG_LOGO_LINUX_CLUT224=y |
632 | CONFIG_LOGO_MAC_CLUT224=y | 636 | CONFIG_LOGO_MAC_CLUT224=y |
637 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
633 | 638 | ||
634 | # | 639 | # |
635 | # Sound | 640 | # Sound |
@@ -657,6 +662,11 @@ CONFIG_LOGO_MAC_CLUT224=y | |||
657 | # CONFIG_MMC is not set | 662 | # CONFIG_MMC is not set |
658 | 663 | ||
659 | # | 664 | # |
665 | # InfiniBand support | ||
666 | # | ||
667 | # CONFIG_INFINIBAND is not set | ||
668 | |||
669 | # | ||
660 | # Character devices | 670 | # Character devices |
661 | # | 671 | # |
662 | CONFIG_MAC_SCC=y | 672 | CONFIG_MAC_SCC=y |
@@ -679,10 +689,16 @@ CONFIG_REISERFS_FS=m | |||
679 | # CONFIG_REISERFS_FS_XATTR is not set | 689 | # CONFIG_REISERFS_FS_XATTR is not set |
680 | CONFIG_JFS_FS=m | 690 | CONFIG_JFS_FS=m |
681 | # CONFIG_JFS_POSIX_ACL is not set | 691 | # CONFIG_JFS_POSIX_ACL is not set |
692 | # CONFIG_JFS_SECURITY is not set | ||
682 | # CONFIG_JFS_DEBUG is not set | 693 | # CONFIG_JFS_DEBUG is not set |
683 | # CONFIG_JFS_STATISTICS is not set | 694 | # CONFIG_JFS_STATISTICS is not set |
684 | CONFIG_FS_POSIX_ACL=y | 695 | CONFIG_FS_POSIX_ACL=y |
696 | |||
697 | # | ||
698 | # XFS support | ||
699 | # | ||
685 | CONFIG_XFS_FS=m | 700 | CONFIG_XFS_FS=m |
701 | CONFIG_XFS_EXPORT=y | ||
686 | # CONFIG_XFS_RT is not set | 702 | # CONFIG_XFS_RT is not set |
687 | # CONFIG_XFS_QUOTA is not set | 703 | # CONFIG_XFS_QUOTA is not set |
688 | # CONFIG_XFS_SECURITY is not set | 704 | # CONFIG_XFS_SECURITY is not set |
@@ -856,8 +872,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
856 | # CONFIG_SCHEDSTATS is not set | 872 | # CONFIG_SCHEDSTATS is not set |
857 | # CONFIG_DEBUG_SLAB is not set | 873 | # CONFIG_DEBUG_SLAB is not set |
858 | # CONFIG_DEBUG_KOBJECT is not set | 874 | # CONFIG_DEBUG_KOBJECT is not set |
859 | # CONFIG_DEBUG_BUGVERBOSE is not set | 875 | CONFIG_DEBUG_BUGVERBOSE=y |
860 | # CONFIG_DEBUG_INFO is not set | 876 | # CONFIG_DEBUG_INFO is not set |
877 | # CONFIG_DEBUG_FS is not set | ||
861 | 878 | ||
862 | # | 879 | # |
863 | # Security options | 880 | # Security options |
@@ -894,6 +911,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
894 | CONFIG_CRYPTO_TEST=m | 911 | CONFIG_CRYPTO_TEST=m |
895 | 912 | ||
896 | # | 913 | # |
914 | # Hardware crypto devices | ||
915 | # | ||
916 | |||
917 | # | ||
897 | # Library routines | 918 | # Library routines |
898 | # | 919 | # |
899 | CONFIG_CRC_CCITT=m | 920 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index ea38e87a6051..4104705628ad 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_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:23:49 2004 | 4 | # Wed Mar 2 15:28:09 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 |
@@ -321,8 +326,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
321 | CONFIG_IP_NF_ARPTABLES=m | 326 | CONFIG_IP_NF_ARPTABLES=m |
322 | CONFIG_IP_NF_ARPFILTER=m | 327 | CONFIG_IP_NF_ARPFILTER=m |
323 | CONFIG_IP_NF_ARP_MANGLE=m | 328 | CONFIG_IP_NF_ARP_MANGLE=m |
324 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
325 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
326 | 329 | ||
327 | # | 330 | # |
328 | # IPv6: Netfilter Configuration | 331 | # IPv6: Netfilter Configuration |
@@ -477,6 +480,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
477 | CONFIG_SERIO=m | 480 | CONFIG_SERIO=m |
478 | CONFIG_SERIO_SERPORT=m | 481 | CONFIG_SERIO_SERPORT=m |
479 | # CONFIG_SERIO_CT82C710 is not set | 482 | # CONFIG_SERIO_CT82C710 is not set |
483 | CONFIG_SERIO_LIBPS2=m | ||
480 | # CONFIG_SERIO_RAW is not set | 484 | # CONFIG_SERIO_RAW is not set |
481 | 485 | ||
482 | # | 486 | # |
@@ -584,6 +588,7 @@ CONFIG_LOGO=y | |||
584 | CONFIG_LOGO_LINUX_MONO=y | 588 | CONFIG_LOGO_LINUX_MONO=y |
585 | CONFIG_LOGO_LINUX_VGA16=y | 589 | CONFIG_LOGO_LINUX_VGA16=y |
586 | CONFIG_LOGO_LINUX_CLUT224=y | 590 | CONFIG_LOGO_LINUX_CLUT224=y |
591 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
587 | 592 | ||
588 | # | 593 | # |
589 | # Sound | 594 | # Sound |
@@ -611,6 +616,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
611 | # CONFIG_MMC is not set | 616 | # CONFIG_MMC is not set |
612 | 617 | ||
613 | # | 618 | # |
619 | # InfiniBand support | ||
620 | # | ||
621 | # CONFIG_INFINIBAND is not set | ||
622 | |||
623 | # | ||
614 | # Character devices | 624 | # Character devices |
615 | # | 625 | # |
616 | CONFIG_MVME147_SCC=y | 626 | CONFIG_MVME147_SCC=y |
@@ -631,10 +641,16 @@ CONFIG_REISERFS_FS=m | |||
631 | # CONFIG_REISERFS_FS_XATTR is not set | 641 | # CONFIG_REISERFS_FS_XATTR is not set |
632 | CONFIG_JFS_FS=m | 642 | CONFIG_JFS_FS=m |
633 | # CONFIG_JFS_POSIX_ACL is not set | 643 | # CONFIG_JFS_POSIX_ACL is not set |
644 | # CONFIG_JFS_SECURITY is not set | ||
634 | # CONFIG_JFS_DEBUG is not set | 645 | # CONFIG_JFS_DEBUG is not set |
635 | # CONFIG_JFS_STATISTICS is not set | 646 | # CONFIG_JFS_STATISTICS is not set |
636 | CONFIG_FS_POSIX_ACL=y | 647 | CONFIG_FS_POSIX_ACL=y |
648 | |||
649 | # | ||
650 | # XFS support | ||
651 | # | ||
637 | CONFIG_XFS_FS=m | 652 | CONFIG_XFS_FS=m |
653 | CONFIG_XFS_EXPORT=y | ||
638 | # CONFIG_XFS_RT is not set | 654 | # CONFIG_XFS_RT is not set |
639 | # CONFIG_XFS_QUOTA is not set | 655 | # CONFIG_XFS_QUOTA is not set |
640 | # CONFIG_XFS_SECURITY is not set | 656 | # CONFIG_XFS_SECURITY is not set |
@@ -796,8 +812,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
796 | # CONFIG_SCHEDSTATS is not set | 812 | # CONFIG_SCHEDSTATS is not set |
797 | # CONFIG_DEBUG_SLAB is not set | 813 | # CONFIG_DEBUG_SLAB is not set |
798 | # CONFIG_DEBUG_KOBJECT is not set | 814 | # CONFIG_DEBUG_KOBJECT is not set |
799 | # CONFIG_DEBUG_BUGVERBOSE is not set | 815 | CONFIG_DEBUG_BUGVERBOSE=y |
800 | # CONFIG_DEBUG_INFO is not set | 816 | # CONFIG_DEBUG_INFO is not set |
817 | # CONFIG_DEBUG_FS is not set | ||
801 | 818 | ||
802 | # | 819 | # |
803 | # Security options | 820 | # Security options |
@@ -834,6 +851,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
834 | CONFIG_CRYPTO_TEST=m | 851 | CONFIG_CRYPTO_TEST=m |
835 | 852 | ||
836 | # | 853 | # |
854 | # Hardware crypto devices | ||
855 | # | ||
856 | |||
857 | # | ||
837 | # Library routines | 858 | # Library routines |
838 | # | 859 | # |
839 | CONFIG_CRC_CCITT=m | 860 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index f931a64939d6..ee776117ff6f 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_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:23:53 2004 | 4 | # Wed Mar 2 15:28:11 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 | # |
@@ -583,6 +587,7 @@ CONFIG_LOGO=y | |||
583 | CONFIG_LOGO_LINUX_MONO=y | 587 | CONFIG_LOGO_LINUX_MONO=y |
584 | CONFIG_LOGO_LINUX_VGA16=y | 588 | CONFIG_LOGO_LINUX_VGA16=y |
585 | CONFIG_LOGO_LINUX_CLUT224=y | 589 | CONFIG_LOGO_LINUX_CLUT224=y |
590 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
586 | 591 | ||
587 | # | 592 | # |
588 | # Sound | 593 | # Sound |
@@ -610,6 +615,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
610 | # CONFIG_MMC is not set | 615 | # CONFIG_MMC is not set |
611 | 616 | ||
612 | # | 617 | # |
618 | # InfiniBand support | ||
619 | # | ||
620 | # CONFIG_INFINIBAND is not set | ||
621 | |||
622 | # | ||
613 | # Character devices | 623 | # Character devices |
614 | # | 624 | # |
615 | CONFIG_MVME162_SCC=y | 625 | CONFIG_MVME162_SCC=y |
@@ -630,10 +640,16 @@ CONFIG_REISERFS_FS=m | |||
630 | # CONFIG_REISERFS_FS_XATTR is not set | 640 | # CONFIG_REISERFS_FS_XATTR is not set |
631 | CONFIG_JFS_FS=m | 641 | CONFIG_JFS_FS=m |
632 | # CONFIG_JFS_POSIX_ACL is not set | 642 | # CONFIG_JFS_POSIX_ACL is not set |
643 | # CONFIG_JFS_SECURITY is not set | ||
633 | # CONFIG_JFS_DEBUG is not set | 644 | # CONFIG_JFS_DEBUG is not set |
634 | # CONFIG_JFS_STATISTICS is not set | 645 | # CONFIG_JFS_STATISTICS is not set |
635 | CONFIG_FS_POSIX_ACL=y | 646 | CONFIG_FS_POSIX_ACL=y |
647 | |||
648 | # | ||
649 | # XFS support | ||
650 | # | ||
636 | CONFIG_XFS_FS=m | 651 | CONFIG_XFS_FS=m |
652 | CONFIG_XFS_EXPORT=y | ||
637 | # CONFIG_XFS_RT is not set | 653 | # CONFIG_XFS_RT is not set |
638 | # CONFIG_XFS_QUOTA is not set | 654 | # CONFIG_XFS_QUOTA is not set |
639 | # CONFIG_XFS_SECURITY is not set | 655 | # CONFIG_XFS_SECURITY is not set |
@@ -795,8 +811,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
795 | # CONFIG_SCHEDSTATS is not set | 811 | # CONFIG_SCHEDSTATS is not set |
796 | # CONFIG_DEBUG_SLAB is not set | 812 | # CONFIG_DEBUG_SLAB is not set |
797 | # CONFIG_DEBUG_KOBJECT is not set | 813 | # CONFIG_DEBUG_KOBJECT is not set |
798 | # CONFIG_DEBUG_BUGVERBOSE is not set | 814 | CONFIG_DEBUG_BUGVERBOSE=y |
799 | # CONFIG_DEBUG_INFO is not set | 815 | # CONFIG_DEBUG_INFO is not set |
816 | # CONFIG_DEBUG_FS is not set | ||
800 | 817 | ||
801 | # | 818 | # |
802 | # Security options | 819 | # Security options |
@@ -833,6 +850,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
833 | CONFIG_CRYPTO_TEST=m | 850 | CONFIG_CRYPTO_TEST=m |
834 | 851 | ||
835 | # | 852 | # |
853 | # Hardware crypto devices | ||
854 | # | ||
855 | |||
856 | # | ||
836 | # Library routines | 857 | # Library routines |
837 | # | 858 | # |
838 | CONFIG_CRC_CCITT=m | 859 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 713020cd6f2e..85df1b02af41 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_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:23:57 2004 | 4 | # Wed Mar 2 15:28:12 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 |
@@ -101,6 +102,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
101 | # | 102 | # |
102 | CONFIG_STANDALONE=y | 103 | CONFIG_STANDALONE=y |
103 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 104 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
105 | CONFIG_FW_LOADER=m | ||
104 | # CONFIG_DEBUG_DRIVER is not set | 106 | # CONFIG_DEBUG_DRIVER is not set |
105 | 107 | ||
106 | # | 108 | # |
@@ -123,6 +125,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
123 | # | 125 | # |
124 | # CONFIG_BLK_DEV_FD is not set | 126 | # CONFIG_BLK_DEV_FD is not set |
125 | # CONFIG_BLK_DEV_XD is not set | 127 | # CONFIG_BLK_DEV_XD is not set |
128 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
126 | CONFIG_BLK_DEV_LOOP=y | 129 | CONFIG_BLK_DEV_LOOP=y |
127 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 130 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
128 | CONFIG_BLK_DEV_NBD=m | 131 | CONFIG_BLK_DEV_NBD=m |
@@ -142,6 +145,7 @@ CONFIG_IOSCHED_NOOP=y | |||
142 | CONFIG_IOSCHED_AS=y | 145 | CONFIG_IOSCHED_AS=y |
143 | CONFIG_IOSCHED_DEADLINE=y | 146 | CONFIG_IOSCHED_DEADLINE=y |
144 | CONFIG_IOSCHED_CFQ=y | 147 | CONFIG_IOSCHED_CFQ=y |
148 | CONFIG_ATA_OVER_ETH=m | ||
145 | 149 | ||
146 | # | 150 | # |
147 | # ATA/ATAPI/MFM/RLL support | 151 | # ATA/ATAPI/MFM/RLL support |
@@ -200,6 +204,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
200 | # | 204 | # |
201 | # CONFIG_SCSI_SPI_ATTRS is not set | 205 | # CONFIG_SCSI_SPI_ATTRS is not set |
202 | # CONFIG_SCSI_FC_ATTRS is not set | 206 | # CONFIG_SCSI_FC_ATTRS is not set |
207 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
203 | 208 | ||
204 | # | 209 | # |
205 | # SCSI low-level drivers | 210 | # SCSI low-level drivers |
@@ -374,8 +379,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
374 | CONFIG_IP_NF_ARPTABLES=m | 379 | CONFIG_IP_NF_ARPTABLES=m |
375 | CONFIG_IP_NF_ARPFILTER=m | 380 | CONFIG_IP_NF_ARPFILTER=m |
376 | CONFIG_IP_NF_ARP_MANGLE=m | 381 | CONFIG_IP_NF_ARP_MANGLE=m |
377 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
378 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
379 | 382 | ||
380 | # | 383 | # |
381 | # IPv6: Netfilter Configuration | 384 | # IPv6: Netfilter Configuration |
@@ -547,6 +550,7 @@ CONFIG_SERIO=m | |||
547 | CONFIG_SERIO_SERPORT=m | 550 | CONFIG_SERIO_SERPORT=m |
548 | # CONFIG_SERIO_CT82C710 is not set | 551 | # CONFIG_SERIO_CT82C710 is not set |
549 | CONFIG_SERIO_Q40KBD=m | 552 | CONFIG_SERIO_Q40KBD=m |
553 | CONFIG_SERIO_LIBPS2=m | ||
550 | # CONFIG_SERIO_RAW is not set | 554 | # CONFIG_SERIO_RAW is not set |
551 | 555 | ||
552 | # | 556 | # |
@@ -658,6 +662,7 @@ CONFIG_LOGO=y | |||
658 | CONFIG_LOGO_LINUX_MONO=y | 662 | CONFIG_LOGO_LINUX_MONO=y |
659 | CONFIG_LOGO_LINUX_VGA16=y | 663 | CONFIG_LOGO_LINUX_VGA16=y |
660 | CONFIG_LOGO_LINUX_CLUT224=y | 664 | CONFIG_LOGO_LINUX_CLUT224=y |
665 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
661 | 666 | ||
662 | # | 667 | # |
663 | # Sound | 668 | # Sound |
@@ -687,6 +692,11 @@ CONFIG_DMASOUND=y | |||
687 | # CONFIG_MMC is not set | 692 | # CONFIG_MMC is not set |
688 | 693 | ||
689 | # | 694 | # |
695 | # InfiniBand support | ||
696 | # | ||
697 | # CONFIG_INFINIBAND is not set | ||
698 | |||
699 | # | ||
690 | # Character devices | 700 | # Character devices |
691 | # | 701 | # |
692 | 702 | ||
@@ -705,10 +715,16 @@ CONFIG_REISERFS_FS=m | |||
705 | # CONFIG_REISERFS_FS_XATTR is not set | 715 | # CONFIG_REISERFS_FS_XATTR is not set |
706 | CONFIG_JFS_FS=m | 716 | CONFIG_JFS_FS=m |
707 | # CONFIG_JFS_POSIX_ACL is not set | 717 | # CONFIG_JFS_POSIX_ACL is not set |
718 | # CONFIG_JFS_SECURITY is not set | ||
708 | # CONFIG_JFS_DEBUG is not set | 719 | # CONFIG_JFS_DEBUG is not set |
709 | # CONFIG_JFS_STATISTICS is not set | 720 | # CONFIG_JFS_STATISTICS is not set |
710 | CONFIG_FS_POSIX_ACL=y | 721 | CONFIG_FS_POSIX_ACL=y |
722 | |||
723 | # | ||
724 | # XFS support | ||
725 | # | ||
711 | CONFIG_XFS_FS=m | 726 | CONFIG_XFS_FS=m |
727 | CONFIG_XFS_EXPORT=y | ||
712 | # CONFIG_XFS_RT is not set | 728 | # CONFIG_XFS_RT is not set |
713 | # CONFIG_XFS_QUOTA is not set | 729 | # CONFIG_XFS_QUOTA is not set |
714 | # CONFIG_XFS_SECURITY is not set | 730 | # CONFIG_XFS_SECURITY is not set |
@@ -868,8 +884,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
868 | # CONFIG_SCHEDSTATS is not set | 884 | # CONFIG_SCHEDSTATS is not set |
869 | # CONFIG_DEBUG_SLAB is not set | 885 | # CONFIG_DEBUG_SLAB is not set |
870 | # CONFIG_DEBUG_KOBJECT is not set | 886 | # CONFIG_DEBUG_KOBJECT is not set |
871 | # CONFIG_DEBUG_BUGVERBOSE is not set | 887 | CONFIG_DEBUG_BUGVERBOSE=y |
872 | # CONFIG_DEBUG_INFO is not set | 888 | # CONFIG_DEBUG_INFO is not set |
889 | # CONFIG_DEBUG_FS is not set | ||
873 | 890 | ||
874 | # | 891 | # |
875 | # Security options | 892 | # Security options |
@@ -906,6 +923,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
906 | CONFIG_CRYPTO_TEST=m | 923 | CONFIG_CRYPTO_TEST=m |
907 | 924 | ||
908 | # | 925 | # |
926 | # Hardware crypto devices | ||
927 | # | ||
928 | |||
929 | # | ||
909 | # Library routines | 930 | # Library routines |
910 | # | 931 | # |
911 | CONFIG_CRC_CCITT=m | 932 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 33c4db63b72c..28d3891a6bcf 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_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:24:01 2004 | 4 | # Wed Mar 2 15:28:14 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 |
@@ -87,6 +88,7 @@ CONFIG_PROC_HARDWARE=y | |||
87 | # | 88 | # |
88 | CONFIG_STANDALONE=y | 89 | CONFIG_STANDALONE=y |
89 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 90 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
91 | CONFIG_FW_LOADER=m | ||
90 | # CONFIG_DEBUG_DRIVER is not set | 92 | # CONFIG_DEBUG_DRIVER is not set |
91 | 93 | ||
92 | # | 94 | # |
@@ -106,6 +108,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
106 | # | 108 | # |
107 | # Block devices | 109 | # Block devices |
108 | # | 110 | # |
111 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
109 | CONFIG_BLK_DEV_LOOP=y | 112 | CONFIG_BLK_DEV_LOOP=y |
110 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 113 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
111 | CONFIG_BLK_DEV_NBD=m | 114 | CONFIG_BLK_DEV_NBD=m |
@@ -125,6 +128,7 @@ CONFIG_IOSCHED_NOOP=y | |||
125 | CONFIG_IOSCHED_AS=y | 128 | CONFIG_IOSCHED_AS=y |
126 | CONFIG_IOSCHED_DEADLINE=y | 129 | CONFIG_IOSCHED_DEADLINE=y |
127 | CONFIG_IOSCHED_CFQ=y | 130 | CONFIG_IOSCHED_CFQ=y |
131 | CONFIG_ATA_OVER_ETH=m | ||
128 | 132 | ||
129 | # | 133 | # |
130 | # ATA/ATAPI/MFM/RLL support | 134 | # ATA/ATAPI/MFM/RLL support |
@@ -159,6 +163,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
159 | # | 163 | # |
160 | # CONFIG_SCSI_SPI_ATTRS is not set | 164 | # CONFIG_SCSI_SPI_ATTRS is not set |
161 | # CONFIG_SCSI_FC_ATTRS is not set | 165 | # CONFIG_SCSI_FC_ATTRS is not set |
166 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
162 | 167 | ||
163 | # | 168 | # |
164 | # SCSI low-level drivers | 169 | # SCSI low-level drivers |
@@ -309,8 +314,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m | |||
309 | CONFIG_IP_NF_ARPTABLES=m | 314 | CONFIG_IP_NF_ARPTABLES=m |
310 | CONFIG_IP_NF_ARPFILTER=m | 315 | CONFIG_IP_NF_ARPFILTER=m |
311 | CONFIG_IP_NF_ARP_MANGLE=m | 316 | CONFIG_IP_NF_ARP_MANGLE=m |
312 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
313 | CONFIG_IP_NF_COMPAT_IPFWADM=m | ||
314 | 317 | ||
315 | # | 318 | # |
316 | # IPv6: Netfilter Configuration | 319 | # IPv6: Netfilter Configuration |
@@ -466,6 +469,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
466 | CONFIG_SERIO=y | 469 | CONFIG_SERIO=y |
467 | CONFIG_SERIO_SERPORT=m | 470 | CONFIG_SERIO_SERPORT=m |
468 | # CONFIG_SERIO_CT82C710 is not set | 471 | # CONFIG_SERIO_CT82C710 is not set |
472 | CONFIG_SERIO_LIBPS2=m | ||
469 | # CONFIG_SERIO_RAW is not set | 473 | # CONFIG_SERIO_RAW is not set |
470 | 474 | ||
471 | # | 475 | # |
@@ -573,6 +577,7 @@ CONFIG_LOGO=y | |||
573 | CONFIG_LOGO_LINUX_MONO=y | 577 | CONFIG_LOGO_LINUX_MONO=y |
574 | CONFIG_LOGO_LINUX_VGA16=y | 578 | CONFIG_LOGO_LINUX_VGA16=y |
575 | CONFIG_LOGO_LINUX_CLUT224=y | 579 | CONFIG_LOGO_LINUX_CLUT224=y |
580 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
576 | 581 | ||
577 | # | 582 | # |
578 | # Sound | 583 | # Sound |
@@ -600,6 +605,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
600 | # CONFIG_MMC is not set | 605 | # CONFIG_MMC is not set |
601 | 606 | ||
602 | # | 607 | # |
608 | # InfiniBand support | ||
609 | # | ||
610 | # CONFIG_INFINIBAND is not set | ||
611 | |||
612 | # | ||
603 | # Character devices | 613 | # Character devices |
604 | # | 614 | # |
605 | 615 | ||
@@ -618,10 +628,16 @@ CONFIG_REISERFS_FS=m | |||
618 | # CONFIG_REISERFS_FS_XATTR is not set | 628 | # CONFIG_REISERFS_FS_XATTR is not set |
619 | CONFIG_JFS_FS=m | 629 | CONFIG_JFS_FS=m |
620 | # CONFIG_JFS_POSIX_ACL is not set | 630 | # CONFIG_JFS_POSIX_ACL is not set |
631 | # CONFIG_JFS_SECURITY is not set | ||
621 | # CONFIG_JFS_DEBUG is not set | 632 | # CONFIG_JFS_DEBUG is not set |
622 | # CONFIG_JFS_STATISTICS is not set | 633 | # CONFIG_JFS_STATISTICS is not set |
623 | CONFIG_FS_POSIX_ACL=y | 634 | CONFIG_FS_POSIX_ACL=y |
635 | |||
636 | # | ||
637 | # XFS support | ||
638 | # | ||
624 | CONFIG_XFS_FS=m | 639 | CONFIG_XFS_FS=m |
640 | CONFIG_XFS_EXPORT=y | ||
625 | # CONFIG_XFS_RT is not set | 641 | # CONFIG_XFS_RT is not set |
626 | # CONFIG_XFS_QUOTA is not set | 642 | # CONFIG_XFS_QUOTA is not set |
627 | # CONFIG_XFS_SECURITY is not set | 643 | # CONFIG_XFS_SECURITY is not set |
@@ -784,8 +800,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
784 | # CONFIG_SCHEDSTATS is not set | 800 | # CONFIG_SCHEDSTATS is not set |
785 | # CONFIG_DEBUG_SLAB is not set | 801 | # CONFIG_DEBUG_SLAB is not set |
786 | # CONFIG_DEBUG_KOBJECT is not set | 802 | # CONFIG_DEBUG_KOBJECT is not set |
787 | # CONFIG_DEBUG_BUGVERBOSE is not set | 803 | CONFIG_DEBUG_BUGVERBOSE=y |
788 | # CONFIG_DEBUG_INFO is not set | 804 | # CONFIG_DEBUG_INFO is not set |
805 | # CONFIG_DEBUG_FS is not set | ||
789 | 806 | ||
790 | # | 807 | # |
791 | # Security options | 808 | # Security options |
@@ -822,6 +839,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
822 | CONFIG_CRYPTO_TEST=m | 839 | CONFIG_CRYPTO_TEST=m |
823 | 840 | ||
824 | # | 841 | # |
842 | # Hardware crypto devices | ||
843 | # | ||
844 | |||
845 | # | ||
825 | # Library routines | 846 | # Library routines |
826 | # | 847 | # |
827 | CONFIG_CRC_CCITT=m | 848 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index fe008c9b10c1..2a05981cf5a0 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_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:24:05 2004 | 4 | # Wed Mar 2 15:28:15 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 |
@@ -98,6 +99,7 @@ CONFIG_PROC_HARDWARE=y | |||
98 | # | 99 | # |
99 | CONFIG_STANDALONE=y | 100 | CONFIG_STANDALONE=y |
100 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 101 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
102 | CONFIG_FW_LOADER=m | ||
101 | # CONFIG_DEBUG_DRIVER is not set | 103 | # CONFIG_DEBUG_DRIVER is not set |
102 | 104 | ||
103 | # | 105 | # |
@@ -117,6 +119,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
117 | # | 119 | # |
118 | # Block devices | 120 | # Block devices |
119 | # | 121 | # |
122 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
120 | CONFIG_BLK_DEV_LOOP=y | 123 | CONFIG_BLK_DEV_LOOP=y |
121 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 124 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
122 | CONFIG_BLK_DEV_NBD=m | 125 | CONFIG_BLK_DEV_NBD=m |
@@ -136,6 +139,7 @@ CONFIG_IOSCHED_NOOP=y | |||
136 | CONFIG_IOSCHED_AS=y | 139 | CONFIG_IOSCHED_AS=y |
137 | CONFIG_IOSCHED_DEADLINE=y | 140 | CONFIG_IOSCHED_DEADLINE=y |
138 | CONFIG_IOSCHED_CFQ=y | 141 | CONFIG_IOSCHED_CFQ=y |
142 | CONFIG_ATA_OVER_ETH=m | ||
139 | 143 | ||
140 | # | 144 | # |
141 | # ATA/ATAPI/MFM/RLL support | 145 | # ATA/ATAPI/MFM/RLL support |
@@ -170,6 +174,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
170 | # | 174 | # |
171 | # CONFIG_SCSI_SPI_ATTRS is not set | 175 | # CONFIG_SCSI_SPI_ATTRS is not set |
172 | # CONFIG_SCSI_FC_ATTRS is not set | 176 | # CONFIG_SCSI_FC_ATTRS is not set |
177 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
173 | 178 | ||
174 | # | 179 | # |
175 | # SCSI low-level drivers | 180 | # 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=y | 479 | CONFIG_SERIO=y |
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 | # |
@@ -583,6 +587,7 @@ CONFIG_LOGO=y | |||
583 | CONFIG_LOGO_LINUX_MONO=y | 587 | CONFIG_LOGO_LINUX_MONO=y |
584 | CONFIG_LOGO_LINUX_VGA16=y | 588 | CONFIG_LOGO_LINUX_VGA16=y |
585 | CONFIG_LOGO_LINUX_CLUT224=y | 589 | CONFIG_LOGO_LINUX_CLUT224=y |
590 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
586 | 591 | ||
587 | # | 592 | # |
588 | # Sound | 593 | # Sound |
@@ -610,6 +615,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
610 | # CONFIG_MMC is not set | 615 | # CONFIG_MMC is not set |
611 | 616 | ||
612 | # | 617 | # |
618 | # InfiniBand support | ||
619 | # | ||
620 | # CONFIG_INFINIBAND is not set | ||
621 | |||
622 | # | ||
613 | # Character devices | 623 | # Character devices |
614 | # | 624 | # |
615 | 625 | ||
@@ -628,10 +638,16 @@ CONFIG_REISERFS_FS=m | |||
628 | # CONFIG_REISERFS_FS_XATTR is not set | 638 | # CONFIG_REISERFS_FS_XATTR is not set |
629 | CONFIG_JFS_FS=m | 639 | CONFIG_JFS_FS=m |
630 | # CONFIG_JFS_POSIX_ACL is not set | 640 | # CONFIG_JFS_POSIX_ACL is not set |
641 | # CONFIG_JFS_SECURITY is not set | ||
631 | # CONFIG_JFS_DEBUG is not set | 642 | # CONFIG_JFS_DEBUG is not set |
632 | # CONFIG_JFS_STATISTICS is not set | 643 | # CONFIG_JFS_STATISTICS is not set |
633 | CONFIG_FS_POSIX_ACL=y | 644 | CONFIG_FS_POSIX_ACL=y |
645 | |||
646 | # | ||
647 | # XFS support | ||
648 | # | ||
634 | CONFIG_XFS_FS=m | 649 | CONFIG_XFS_FS=m |
650 | CONFIG_XFS_EXPORT=y | ||
635 | # CONFIG_XFS_RT is not set | 651 | # CONFIG_XFS_RT is not set |
636 | # CONFIG_XFS_QUOTA is not set | 652 | # CONFIG_XFS_QUOTA is not set |
637 | # CONFIG_XFS_SECURITY is not set | 653 | # CONFIG_XFS_SECURITY is not set |
@@ -794,8 +810,9 @@ CONFIG_MAGIC_SYSRQ=y | |||
794 | # CONFIG_SCHEDSTATS is not set | 810 | # CONFIG_SCHEDSTATS is not set |
795 | # CONFIG_DEBUG_SLAB is not set | 811 | # CONFIG_DEBUG_SLAB is not set |
796 | # CONFIG_DEBUG_KOBJECT is not set | 812 | # CONFIG_DEBUG_KOBJECT is not set |
797 | # CONFIG_DEBUG_BUGVERBOSE is not set | 813 | CONFIG_DEBUG_BUGVERBOSE=y |
798 | # CONFIG_DEBUG_INFO is not set | 814 | # CONFIG_DEBUG_INFO is not set |
815 | # CONFIG_DEBUG_FS is not set | ||
799 | 816 | ||
800 | # | 817 | # |
801 | # Security options | 818 | # Security options |
@@ -832,6 +849,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
832 | CONFIG_CRYPTO_TEST=m | 849 | CONFIG_CRYPTO_TEST=m |
833 | 850 | ||
834 | # | 851 | # |
852 | # Hardware crypto devices | ||
853 | # | ||
854 | |||
855 | # | ||
835 | # Library routines | 856 | # Library routines |
836 | # | 857 | # |
837 | CONFIG_CRC_CCITT=m | 858 | CONFIG_CRC_CCITT=m |
diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig index 78f57d398340..2f09daca103f 100644 --- a/arch/m68k/defconfig +++ b/arch/m68k/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:23:36 2004 | 4 | # Wed Mar 2 15:27:58 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 |
@@ -92,6 +93,7 @@ CONFIG_PROC_HARDWARE=y | |||
92 | # | 93 | # |
93 | CONFIG_STANDALONE=y | 94 | CONFIG_STANDALONE=y |
94 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 95 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
96 | # CONFIG_FW_LOADER is not set | ||
95 | 97 | ||
96 | # | 98 | # |
97 | # Memory Technology Devices (MTD) | 99 | # Memory Technology Devices (MTD) |
@@ -112,6 +114,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
112 | # | 114 | # |
113 | CONFIG_AMIGA_FLOPPY=y | 115 | CONFIG_AMIGA_FLOPPY=y |
114 | # CONFIG_AMIGA_Z2RAM is not set | 116 | # CONFIG_AMIGA_Z2RAM is not set |
117 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
115 | # CONFIG_BLK_DEV_LOOP is not set | 118 | # CONFIG_BLK_DEV_LOOP is not set |
116 | # CONFIG_BLK_DEV_NBD is not set | 119 | # CONFIG_BLK_DEV_NBD is not set |
117 | CONFIG_BLK_DEV_RAM=y | 120 | CONFIG_BLK_DEV_RAM=y |
@@ -130,6 +133,7 @@ CONFIG_IOSCHED_NOOP=y | |||
130 | CONFIG_IOSCHED_AS=y | 133 | CONFIG_IOSCHED_AS=y |
131 | CONFIG_IOSCHED_DEADLINE=y | 134 | CONFIG_IOSCHED_DEADLINE=y |
132 | CONFIG_IOSCHED_CFQ=y | 135 | CONFIG_IOSCHED_CFQ=y |
136 | # CONFIG_ATA_OVER_ETH is not set | ||
133 | 137 | ||
134 | # | 138 | # |
135 | # ATA/ATAPI/MFM/RLL support | 139 | # ATA/ATAPI/MFM/RLL support |
@@ -164,6 +168,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
164 | # | 168 | # |
165 | # CONFIG_SCSI_SPI_ATTRS is not set | 169 | # CONFIG_SCSI_SPI_ATTRS is not set |
166 | # CONFIG_SCSI_FC_ATTRS is not set | 170 | # CONFIG_SCSI_FC_ATTRS is not set |
171 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
167 | 172 | ||
168 | # | 173 | # |
169 | # SCSI low-level drivers | 174 | # SCSI low-level drivers |
@@ -331,6 +336,7 @@ CONFIG_SOUND_GAMEPORT=y | |||
331 | CONFIG_SERIO=y | 336 | CONFIG_SERIO=y |
332 | CONFIG_SERIO_SERPORT=y | 337 | CONFIG_SERIO_SERPORT=y |
333 | # CONFIG_SERIO_CT82C710 is not set | 338 | # CONFIG_SERIO_CT82C710 is not set |
339 | CONFIG_SERIO_LIBPS2=y | ||
334 | # CONFIG_SERIO_RAW is not set | 340 | # CONFIG_SERIO_RAW is not set |
335 | 341 | ||
336 | # | 342 | # |
@@ -440,6 +446,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
440 | # Logo configuration | 446 | # Logo configuration |
441 | # | 447 | # |
442 | # CONFIG_LOGO is not set | 448 | # CONFIG_LOGO is not set |
449 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
443 | 450 | ||
444 | # | 451 | # |
445 | # Sound | 452 | # Sound |
@@ -467,6 +474,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
467 | # CONFIG_MMC is not set | 474 | # CONFIG_MMC is not set |
468 | 475 | ||
469 | # | 476 | # |
477 | # InfiniBand support | ||
478 | # | ||
479 | # CONFIG_INFINIBAND is not set | ||
480 | |||
481 | # | ||
470 | # Character devices | 482 | # Character devices |
471 | # | 483 | # |
472 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 484 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
@@ -483,6 +495,10 @@ CONFIG_EXT2_FS=y | |||
483 | # CONFIG_JBD is not set | 495 | # CONFIG_JBD is not set |
484 | # CONFIG_REISERFS_FS is not set | 496 | # CONFIG_REISERFS_FS is not set |
485 | # CONFIG_JFS_FS is not set | 497 | # CONFIG_JFS_FS is not set |
498 | |||
499 | # | ||
500 | # XFS support | ||
501 | # | ||
486 | # CONFIG_XFS_FS is not set | 502 | # CONFIG_XFS_FS is not set |
487 | CONFIG_MINIX_FS=y | 503 | CONFIG_MINIX_FS=y |
488 | # CONFIG_ROMFS_FS is not set | 504 | # CONFIG_ROMFS_FS is not set |
@@ -544,7 +560,6 @@ CONFIG_NFS_FS=y | |||
544 | # CONFIG_NFS_DIRECTIO is not set | 560 | # CONFIG_NFS_DIRECTIO is not set |
545 | # CONFIG_NFSD is not set | 561 | # CONFIG_NFSD is not set |
546 | CONFIG_LOCKD=y | 562 | CONFIG_LOCKD=y |
547 | # CONFIG_EXPORTFS is not set | ||
548 | CONFIG_SUNRPC=y | 563 | CONFIG_SUNRPC=y |
549 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 564 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
550 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 565 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
@@ -609,6 +624,7 @@ CONFIG_NLS_CODEPAGE_437=y | |||
609 | # Kernel hacking | 624 | # Kernel hacking |
610 | # | 625 | # |
611 | # CONFIG_DEBUG_KERNEL is not set | 626 | # CONFIG_DEBUG_KERNEL is not set |
627 | CONFIG_DEBUG_BUGVERBOSE=y | ||
612 | 628 | ||
613 | # | 629 | # |
614 | # Security options | 630 | # Security options |
@@ -622,6 +638,10 @@ CONFIG_NLS_CODEPAGE_437=y | |||
622 | # CONFIG_CRYPTO is not set | 638 | # CONFIG_CRYPTO is not set |
623 | 639 | ||
624 | # | 640 | # |
641 | # Hardware crypto devices | ||
642 | # | ||
643 | |||
644 | # | ||
625 | # Library routines | 645 | # Library routines |
626 | # | 646 | # |
627 | # CONFIG_CRC_CCITT is not set | 647 | # CONFIG_CRC_CCITT is not set |