aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2005-04-18 13:47:34 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 13:47:34 -0400
commit865108d13801d39ec038bdc82b5bec5e1eaffa9d (patch)
treebfeb17a5c4eb933099eaf9e4d35df43e2fed5635 /arch
parent4575ceb1d31d9fabc2314410f1645748284c95a9 (diff)
[PATCH] M68k: Update defconfigs for 2.6.12-rc2
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/configs/amiga_defconfig76
-rw-r--r--arch/m68k/configs/apollo_defconfig52
-rw-r--r--arch/m68k/configs/atari_defconfig63
-rw-r--r--arch/m68k/configs/bvme6000_defconfig52
-rw-r--r--arch/m68k/configs/hp300_defconfig52
-rw-r--r--arch/m68k/configs/mac_defconfig60
-rw-r--r--arch/m68k/configs/mvme147_defconfig58
-rw-r--r--arch/m68k/configs/mvme16x_defconfig58
-rw-r--r--arch/m68k/configs/q40_defconfig61
-rw-r--r--arch/m68k/configs/sun3_defconfig58
-rw-r--r--arch/m68k/configs/sun3x_defconfig58
-rw-r--r--arch/m68k/defconfig47
12 files changed, 414 insertions, 281 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 4c26ea289d59..7dbf997ff205 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:00 2005 4# Tue Apr 5 14:05:59 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -118,9 +119,10 @@ CONFIG_FW_LOADER=m
118# 119#
119CONFIG_PARPORT=m 120CONFIG_PARPORT=m
120# CONFIG_PARPORT_PC is not set 121# CONFIG_PARPORT_PC is not set
122CONFIG_PARPORT_NOT_PC=y
121CONFIG_PARPORT_AMIGA=m 123CONFIG_PARPORT_AMIGA=m
122CONFIG_PARPORT_MFC3=m 124CONFIG_PARPORT_MFC3=m
123# CONFIG_PARPORT_OTHER is not set 125# CONFIG_PARPORT_GSC is not set
124CONFIG_PARPORT_1284=y 126CONFIG_PARPORT_1284=y
125 127
126# 128#
@@ -230,7 +232,6 @@ CONFIG_SCSI_CONSTANTS=y
230# CONFIG_SCSI_BUSLOGIC is not set 232# CONFIG_SCSI_BUSLOGIC is not set
231# CONFIG_SCSI_DTC3280 is not set 233# CONFIG_SCSI_DTC3280 is not set
232# CONFIG_SCSI_EATA is not set 234# CONFIG_SCSI_EATA is not set
233# CONFIG_SCSI_EATA_PIO is not set
234# CONFIG_SCSI_FUTURE_DOMAIN is not set 235# CONFIG_SCSI_FUTURE_DOMAIN is not set
235# CONFIG_SCSI_GDTH is not set 236# CONFIG_SCSI_GDTH is not set
236# CONFIG_SCSI_GENERIC_NCR5380 is not set 237# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -278,6 +279,8 @@ CONFIG_DM_CRYPT=m
278CONFIG_DM_SNAPSHOT=m 279CONFIG_DM_SNAPSHOT=m
279CONFIG_DM_MIRROR=m 280CONFIG_DM_MIRROR=m
280CONFIG_DM_ZERO=m 281CONFIG_DM_ZERO=m
282CONFIG_DM_MULTIPATH=m
283CONFIG_DM_MULTIPATH_EMC=m
281 284
282# 285#
283# Fusion MPT device support 286# Fusion MPT device support
@@ -301,7 +304,6 @@ CONFIG_NET=y
301# 304#
302CONFIG_PACKET=y 305CONFIG_PACKET=y
303# CONFIG_PACKET_MMAP is not set 306# CONFIG_PACKET_MMAP is not set
304CONFIG_NETLINK_DEV=y
305CONFIG_UNIX=y 307CONFIG_UNIX=y
306CONFIG_NET_KEY=y 308CONFIG_NET_KEY=y
307CONFIG_INET=y 309CONFIG_INET=y
@@ -401,7 +403,7 @@ CONFIG_IP_NF_ARPFILTER=m
401CONFIG_IP_NF_ARP_MANGLE=m 403CONFIG_IP_NF_ARP_MANGLE=m
402 404
403# 405#
404# IPv6: Netfilter Configuration 406# IPv6: Netfilter Configuration (EXPERIMENTAL)
405# 407#
406CONFIG_IP6_NF_QUEUE=m 408CONFIG_IP6_NF_QUEUE=m
407CONFIG_IP6_NF_IPTABLES=m 409CONFIG_IP6_NF_IPTABLES=m
@@ -473,7 +475,6 @@ CONFIG_DUMMY=m
473# CONFIG_BONDING is not set 475# CONFIG_BONDING is not set
474CONFIG_EQUALIZER=m 476CONFIG_EQUALIZER=m
475# CONFIG_TUN is not set 477# CONFIG_TUN is not set
476# CONFIG_ETHERTAP is not set
477 478
478# 479#
479# ARCnet devices 480# ARCnet devices
@@ -567,17 +568,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
567# CONFIG_INPUT_EVBUG is not set 568# CONFIG_INPUT_EVBUG is not set
568 569
569# 570#
570# Input I/O drivers
571#
572# CONFIG_GAMEPORT is not set
573CONFIG_SOUND_GAMEPORT=y
574CONFIG_SERIO=m
575CONFIG_SERIO_SERPORT=m
576# CONFIG_SERIO_CT82C710 is not set
577# CONFIG_SERIO_PARKBD is not set
578# CONFIG_SERIO_RAW is not set
579
580#
581# Input Device Drivers 571# Input Device Drivers
582# 572#
583CONFIG_INPUT_KEYBOARD=y 573CONFIG_INPUT_KEYBOARD=y
@@ -596,21 +586,43 @@ CONFIG_INPUT_MOUSE=y
596CONFIG_MOUSE_AMIGA=y 586CONFIG_MOUSE_AMIGA=y
597# CONFIG_MOUSE_VSXXXAA is not set 587# CONFIG_MOUSE_VSXXXAA is not set
598CONFIG_INPUT_JOYSTICK=y 588CONFIG_INPUT_JOYSTICK=y
589# CONFIG_JOYSTICK_ANALOG is not set
590# CONFIG_JOYSTICK_A3D is not set
591# CONFIG_JOYSTICK_ADI is not set
592# CONFIG_JOYSTICK_COBRA is not set
593# CONFIG_JOYSTICK_GF2K is not set
594# CONFIG_JOYSTICK_GRIP is not set
595# CONFIG_JOYSTICK_GRIP_MP is not set
596# CONFIG_JOYSTICK_GUILLEMOT is not set
597# CONFIG_JOYSTICK_INTERACT is not set
598# CONFIG_JOYSTICK_SIDEWINDER is not set
599# CONFIG_JOYSTICK_TMDC is not set
599# CONFIG_JOYSTICK_IFORCE is not set 600# CONFIG_JOYSTICK_IFORCE is not set
600# CONFIG_JOYSTICK_WARRIOR is not set 601# CONFIG_JOYSTICK_WARRIOR is not set
601# CONFIG_JOYSTICK_MAGELLAN is not set 602# CONFIG_JOYSTICK_MAGELLAN is not set
602# CONFIG_JOYSTICK_SPACEORB is not set 603# CONFIG_JOYSTICK_SPACEORB is not set
603# CONFIG_JOYSTICK_SPACEBALL is not set 604# CONFIG_JOYSTICK_SPACEBALL is not set
604# CONFIG_JOYSTICK_STINGER is not set 605# CONFIG_JOYSTICK_STINGER is not set
605# CONFIG_JOYSTICK_TWIDDLER is not set 606# CONFIG_JOYSTICK_TWIDJOY is not set
606# CONFIG_JOYSTICK_DB9 is not set 607# CONFIG_JOYSTICK_DB9 is not set
607# CONFIG_JOYSTICK_GAMECON is not set 608# CONFIG_JOYSTICK_GAMECON is not set
608# CONFIG_JOYSTICK_TURBOGRAFX is not set 609# CONFIG_JOYSTICK_TURBOGRAFX is not set
609CONFIG_JOYSTICK_AMIGA=m 610CONFIG_JOYSTICK_AMIGA=m
611# CONFIG_JOYSTICK_JOYDUMP is not set
610# CONFIG_INPUT_TOUCHSCREEN is not set 612# CONFIG_INPUT_TOUCHSCREEN is not set
611# CONFIG_INPUT_MISC is not set 613# CONFIG_INPUT_MISC is not set
612 614
613# 615#
616# Hardware I/O ports
617#
618CONFIG_SERIO=m
619CONFIG_SERIO_SERPORT=m
620# CONFIG_SERIO_PARKBD is not set
621# CONFIG_SERIO_RAW is not set
622# CONFIG_GAMEPORT is not set
623CONFIG_SOUND_GAMEPORT=y
624
625#
614# Character devices 626# Character devices
615# 627#
616CONFIG_VT=y 628CONFIG_VT=y
@@ -656,6 +668,10 @@ CONFIG_GEN_RTC_X=y
656# CONFIG_RAW_DRIVER is not set 668# CONFIG_RAW_DRIVER is not set
657 669
658# 670#
671# TPM devices
672#
673
674#
659# I2C support 675# I2C support
660# 676#
661# CONFIG_I2C is not set 677# CONFIG_I2C is not set
@@ -683,6 +699,11 @@ CONFIG_GEN_RTC_X=y
683# Graphics support 699# Graphics support
684# 700#
685CONFIG_FB=y 701CONFIG_FB=y
702CONFIG_FB_CFB_FILLRECT=y
703CONFIG_FB_CFB_COPYAREA=y
704CONFIG_FB_CFB_IMAGEBLIT=y
705CONFIG_FB_SOFT_CURSOR=y
706# CONFIG_FB_MACMODES is not set
686CONFIG_FB_MODE_HELPERS=y 707CONFIG_FB_MODE_HELPERS=y
687# CONFIG_FB_TILEBLITTING is not set 708# CONFIG_FB_TILEBLITTING is not set
688CONFIG_FB_CIRRUS=m 709CONFIG_FB_CIRRUS=m
@@ -691,6 +712,7 @@ CONFIG_FB_AMIGA_OCS=y
691CONFIG_FB_AMIGA_ECS=y 712CONFIG_FB_AMIGA_ECS=y
692CONFIG_FB_AMIGA_AGA=y 713CONFIG_FB_AMIGA_AGA=y
693CONFIG_FB_FM2=y 714CONFIG_FB_FM2=y
715# CONFIG_FB_S1D13XXX is not set
694# CONFIG_FB_VIRTUAL is not set 716# CONFIG_FB_VIRTUAL is not set
695 717
696# 718#
@@ -726,10 +748,6 @@ CONFIG_DMASOUND=m
726# CONFIG_USB_ARCH_HAS_OHCI is not set 748# CONFIG_USB_ARCH_HAS_OHCI is not set
727 749
728# 750#
729# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
730#
731
732#
733# USB Gadget Support 751# USB Gadget Support
734# 752#
735# CONFIG_USB_GADGET is not set 753# CONFIG_USB_GADGET is not set
@@ -931,14 +949,19 @@ CONFIG_NLS_UTF8=m
931# 949#
932# Kernel hacking 950# Kernel hacking
933# 951#
952# CONFIG_PRINTK_TIME is not set
934CONFIG_DEBUG_KERNEL=y 953CONFIG_DEBUG_KERNEL=y
935CONFIG_MAGIC_SYSRQ=y 954CONFIG_MAGIC_SYSRQ=y
955CONFIG_LOG_BUF_SHIFT=16
936# CONFIG_SCHEDSTATS is not set 956# CONFIG_SCHEDSTATS is not set
937# CONFIG_DEBUG_SLAB is not set 957# CONFIG_DEBUG_SLAB is not set
958# CONFIG_DEBUG_SPINLOCK is not set
959# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
938# CONFIG_DEBUG_KOBJECT is not set 960# CONFIG_DEBUG_KOBJECT is not set
939CONFIG_DEBUG_BUGVERBOSE=y 961CONFIG_DEBUG_BUGVERBOSE=y
940# CONFIG_DEBUG_INFO is not set 962# CONFIG_DEBUG_INFO is not set
941# CONFIG_DEBUG_FS is not set 963# CONFIG_DEBUG_FS is not set
964# CONFIG_FRAME_POINTER is not set
942 965
943# 966#
944# Security options 967# Security options
@@ -957,7 +980,8 @@ CONFIG_CRYPTO_MD5=m
957CONFIG_CRYPTO_SHA1=m 980CONFIG_CRYPTO_SHA1=m
958CONFIG_CRYPTO_SHA256=m 981CONFIG_CRYPTO_SHA256=m
959CONFIG_CRYPTO_SHA512=m 982CONFIG_CRYPTO_SHA512=m
960# CONFIG_CRYPTO_WP512 is not set 983CONFIG_CRYPTO_WP512=m
984CONFIG_CRYPTO_TGR192=m
961CONFIG_CRYPTO_DES=m 985CONFIG_CRYPTO_DES=m
962CONFIG_CRYPTO_BLOWFISH=m 986CONFIG_CRYPTO_BLOWFISH=m
963CONFIG_CRYPTO_TWOFISH=m 987CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index ade3028cd992..505a2968e604 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:01 2005 4# Tue Apr 5 14:06:00 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -201,6 +202,8 @@ CONFIG_DM_CRYPT=m
201CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
202CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
203CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
204 207
205# 208#
206# Fusion MPT device support 209# Fusion MPT device support
@@ -224,7 +227,6 @@ CONFIG_NET=y
224# 227#
225CONFIG_PACKET=y 228CONFIG_PACKET=y
226# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
227CONFIG_NETLINK_DEV=y
228CONFIG_UNIX=y 230CONFIG_UNIX=y
229CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
230CONFIG_INET=y 232CONFIG_INET=y
@@ -327,7 +329,7 @@ CONFIG_IP_NF_ARPFILTER=m
327CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
328 330
329# 331#
330# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
331# 333#
332CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
333CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -399,7 +401,6 @@ CONFIG_DUMMY=m
399# CONFIG_BONDING is not set 401# CONFIG_BONDING is not set
400CONFIG_EQUALIZER=m 402CONFIG_EQUALIZER=m
401# CONFIG_TUN is not set 403# CONFIG_TUN is not set
402# CONFIG_ETHERTAP is not set
403 404
404# 405#
405# Ethernet (10 or 100Mbit) 406# Ethernet (10 or 100Mbit)
@@ -472,17 +473,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
472# CONFIG_INPUT_EVBUG is not set 473# CONFIG_INPUT_EVBUG is not set
473 474
474# 475#
475# Input I/O drivers
476#
477# CONFIG_GAMEPORT is not set
478CONFIG_SOUND_GAMEPORT=y
479CONFIG_SERIO=m
480CONFIG_SERIO_SERPORT=m
481# CONFIG_SERIO_CT82C710 is not set
482CONFIG_SERIO_LIBPS2=m
483# CONFIG_SERIO_RAW is not set
484
485#
486# Input Device Drivers 476# Input Device Drivers
487# 477#
488CONFIG_INPUT_KEYBOARD=y 478CONFIG_INPUT_KEYBOARD=y
@@ -500,6 +490,16 @@ CONFIG_MOUSE_SERIAL=m
500# CONFIG_INPUT_MISC is not set 490# CONFIG_INPUT_MISC is not set
501 491
502# 492#
493# Hardware I/O ports
494#
495CONFIG_SERIO=m
496CONFIG_SERIO_SERPORT=m
497CONFIG_SERIO_LIBPS2=m
498# CONFIG_SERIO_RAW is not set
499# CONFIG_GAMEPORT is not set
500CONFIG_SOUND_GAMEPORT=y
501
502#
503# Character devices 503# Character devices
504# 504#
505CONFIG_VT=y 505CONFIG_VT=y
@@ -540,6 +540,10 @@ CONFIG_GEN_RTC_X=y
540# CONFIG_RAW_DRIVER is not set 540# CONFIG_RAW_DRIVER is not set
541 541
542# 542#
543# TPM devices
544#
545
546#
543# I2C support 547# I2C support
544# 548#
545# CONFIG_I2C is not set 549# CONFIG_I2C is not set
@@ -585,10 +589,6 @@ CONFIG_DUMMY_CONSOLE=y
585# CONFIG_USB_ARCH_HAS_OHCI is not set 589# CONFIG_USB_ARCH_HAS_OHCI is not set
586 590
587# 591#
588# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
589#
590
591#
592# USB Gadget Support 592# USB Gadget Support
593# 593#
594# CONFIG_USB_GADGET is not set 594# CONFIG_USB_GADGET is not set
@@ -788,14 +788,19 @@ CONFIG_NLS_UTF8=m
788# 788#
789# Kernel hacking 789# Kernel hacking
790# 790#
791# CONFIG_PRINTK_TIME is not set
791CONFIG_DEBUG_KERNEL=y 792CONFIG_DEBUG_KERNEL=y
792CONFIG_MAGIC_SYSRQ=y 793CONFIG_MAGIC_SYSRQ=y
794CONFIG_LOG_BUF_SHIFT=16
793# CONFIG_SCHEDSTATS is not set 795# CONFIG_SCHEDSTATS is not set
794# CONFIG_DEBUG_SLAB is not set 796# CONFIG_DEBUG_SLAB is not set
797# CONFIG_DEBUG_SPINLOCK is not set
798# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
795# CONFIG_DEBUG_KOBJECT is not set 799# CONFIG_DEBUG_KOBJECT is not set
796CONFIG_DEBUG_BUGVERBOSE=y 800CONFIG_DEBUG_BUGVERBOSE=y
797# CONFIG_DEBUG_INFO is not set 801# CONFIG_DEBUG_INFO is not set
798# CONFIG_DEBUG_FS is not set 802# CONFIG_DEBUG_FS is not set
803# CONFIG_FRAME_POINTER is not set
799 804
800# 805#
801# Security options 806# Security options
@@ -814,7 +819,8 @@ CONFIG_CRYPTO_MD5=y
814CONFIG_CRYPTO_SHA1=m 819CONFIG_CRYPTO_SHA1=m
815CONFIG_CRYPTO_SHA256=m 820CONFIG_CRYPTO_SHA256=m
816CONFIG_CRYPTO_SHA512=m 821CONFIG_CRYPTO_SHA512=m
817# CONFIG_CRYPTO_WP512 is not set 822CONFIG_CRYPTO_WP512=m
823CONFIG_CRYPTO_TGR192=m
818CONFIG_CRYPTO_DES=y 824CONFIG_CRYPTO_DES=y
819CONFIG_CRYPTO_BLOWFISH=m 825CONFIG_CRYPTO_BLOWFISH=m
820CONFIG_CRYPTO_TWOFISH=m 826CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 574c16ab7b66..617aa73c3250 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:03 2005 4# Tue Apr 5 14:06:18 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -114,8 +115,9 @@ CONFIG_FW_LOADER=m
114# 115#
115CONFIG_PARPORT=m 116CONFIG_PARPORT=m
116# CONFIG_PARPORT_PC is not set 117# CONFIG_PARPORT_PC is not set
118CONFIG_PARPORT_NOT_PC=y
117CONFIG_PARPORT_ATARI=m 119CONFIG_PARPORT_ATARI=m
118# CONFIG_PARPORT_OTHER is not set 120# CONFIG_PARPORT_GSC is not set
119CONFIG_PARPORT_1284=y 121CONFIG_PARPORT_1284=y
120 122
121# 123#
@@ -233,6 +235,8 @@ CONFIG_DM_CRYPT=m
233CONFIG_DM_SNAPSHOT=m 235CONFIG_DM_SNAPSHOT=m
234CONFIG_DM_MIRROR=m 236CONFIG_DM_MIRROR=m
235CONFIG_DM_ZERO=m 237CONFIG_DM_ZERO=m
238CONFIG_DM_MULTIPATH=m
239CONFIG_DM_MULTIPATH_EMC=m
236 240
237# 241#
238# Fusion MPT device support 242# Fusion MPT device support
@@ -256,7 +260,6 @@ CONFIG_NET=y
256# 260#
257CONFIG_PACKET=y 261CONFIG_PACKET=y
258# CONFIG_PACKET_MMAP is not set 262# CONFIG_PACKET_MMAP is not set
259CONFIG_NETLINK_DEV=y
260CONFIG_UNIX=y 263CONFIG_UNIX=y
261CONFIG_NET_KEY=y 264CONFIG_NET_KEY=y
262CONFIG_INET=y 265CONFIG_INET=y
@@ -356,7 +359,7 @@ CONFIG_IP_NF_ARPFILTER=m
356CONFIG_IP_NF_ARP_MANGLE=m 359CONFIG_IP_NF_ARP_MANGLE=m
357 360
358# 361#
359# IPv6: Netfilter Configuration 362# IPv6: Netfilter Configuration (EXPERIMENTAL)
360# 363#
361CONFIG_IP6_NF_QUEUE=m 364CONFIG_IP6_NF_QUEUE=m
362CONFIG_IP6_NF_IPTABLES=m 365CONFIG_IP6_NF_IPTABLES=m
@@ -428,7 +431,6 @@ CONFIG_DUMMY=m
428# CONFIG_BONDING is not set 431# CONFIG_BONDING is not set
429CONFIG_EQUALIZER=m 432CONFIG_EQUALIZER=m
430# CONFIG_TUN is not set 433# CONFIG_TUN is not set
431# CONFIG_ETHERTAP is not set
432 434
433# 435#
434# Ethernet (10 or 100Mbit) 436# Ethernet (10 or 100Mbit)
@@ -502,18 +504,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
502# CONFIG_INPUT_EVBUG is not set 504# CONFIG_INPUT_EVBUG is not set
503 505
504# 506#
505# Input I/O drivers
506#
507# CONFIG_GAMEPORT is not set
508CONFIG_SOUND_GAMEPORT=y
509CONFIG_SERIO=y
510CONFIG_SERIO_SERPORT=y
511# CONFIG_SERIO_CT82C710 is not set
512# CONFIG_SERIO_PARKBD is not set
513CONFIG_SERIO_LIBPS2=y
514# CONFIG_SERIO_RAW is not set
515
516#
517# Input Device Drivers 507# Input Device Drivers
518# 508#
519CONFIG_INPUT_KEYBOARD=y 509CONFIG_INPUT_KEYBOARD=y
@@ -533,6 +523,17 @@ CONFIG_INPUT_M68K_BEEP=m
533CONFIG_INPUT_UINPUT=m 523CONFIG_INPUT_UINPUT=m
534 524
535# 525#
526# Hardware I/O ports
527#
528CONFIG_SERIO=y
529CONFIG_SERIO_SERPORT=y
530# CONFIG_SERIO_PARKBD is not set
531CONFIG_SERIO_LIBPS2=y
532# CONFIG_SERIO_RAW is not set
533# CONFIG_GAMEPORT is not set
534CONFIG_SOUND_GAMEPORT=y
535
536#
536# Character devices 537# Character devices
537# 538#
538CONFIG_VT=y 539CONFIG_VT=y
@@ -578,6 +579,10 @@ CONFIG_GEN_RTC_X=y
578# CONFIG_RAW_DRIVER is not set 579# CONFIG_RAW_DRIVER is not set
579 580
580# 581#
582# TPM devices
583#
584
585#
581# I2C support 586# I2C support
582# 587#
583# CONFIG_I2C is not set 588# CONFIG_I2C is not set
@@ -605,9 +610,15 @@ CONFIG_GEN_RTC_X=y
605# Graphics support 610# Graphics support
606# 611#
607CONFIG_FB=y 612CONFIG_FB=y
613# CONFIG_FB_CFB_FILLRECT is not set
614# CONFIG_FB_CFB_COPYAREA is not set
615# CONFIG_FB_CFB_IMAGEBLIT is not set
616# CONFIG_FB_SOFT_CURSOR is not set
617# CONFIG_FB_MACMODES is not set
608CONFIG_FB_MODE_HELPERS=y 618CONFIG_FB_MODE_HELPERS=y
609# CONFIG_FB_TILEBLITTING is not set 619# CONFIG_FB_TILEBLITTING is not set
610# CONFIG_FB_ATY is not set 620# CONFIG_FB_ATY is not set
621# CONFIG_FB_S1D13XXX is not set
611# CONFIG_FB_VIRTUAL is not set 622# CONFIG_FB_VIRTUAL is not set
612 623
613# 624#
@@ -639,10 +650,6 @@ CONFIG_DMASOUND=m
639# CONFIG_USB_ARCH_HAS_OHCI is not set 650# CONFIG_USB_ARCH_HAS_OHCI is not set
640 651
641# 652#
642# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
643#
644
645#
646# USB Gadget Support 653# USB Gadget Support
647# 654#
648# CONFIG_USB_GADGET is not set 655# CONFIG_USB_GADGET is not set
@@ -844,14 +851,19 @@ CONFIG_NLS_UTF8=m
844# 851#
845# Kernel hacking 852# Kernel hacking
846# 853#
854# CONFIG_PRINTK_TIME is not set
847CONFIG_DEBUG_KERNEL=y 855CONFIG_DEBUG_KERNEL=y
848CONFIG_MAGIC_SYSRQ=y 856CONFIG_MAGIC_SYSRQ=y
857CONFIG_LOG_BUF_SHIFT=16
849# CONFIG_SCHEDSTATS is not set 858# CONFIG_SCHEDSTATS is not set
850# CONFIG_DEBUG_SLAB is not set 859# CONFIG_DEBUG_SLAB is not set
860# CONFIG_DEBUG_SPINLOCK is not set
861# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
851# CONFIG_DEBUG_KOBJECT is not set 862# CONFIG_DEBUG_KOBJECT is not set
852CONFIG_DEBUG_BUGVERBOSE=y 863CONFIG_DEBUG_BUGVERBOSE=y
853# CONFIG_DEBUG_INFO is not set 864# CONFIG_DEBUG_INFO is not set
854# CONFIG_DEBUG_FS is not set 865# CONFIG_DEBUG_FS is not set
866# CONFIG_FRAME_POINTER is not set
855 867
856# 868#
857# Security options 869# Security options
@@ -870,7 +882,8 @@ CONFIG_CRYPTO_MD5=m
870CONFIG_CRYPTO_SHA1=m 882CONFIG_CRYPTO_SHA1=m
871CONFIG_CRYPTO_SHA256=m 883CONFIG_CRYPTO_SHA256=m
872CONFIG_CRYPTO_SHA512=m 884CONFIG_CRYPTO_SHA512=m
873# CONFIG_CRYPTO_WP512 is not set 885CONFIG_CRYPTO_WP512=m
886CONFIG_CRYPTO_TGR192=m
874CONFIG_CRYPTO_DES=m 887CONFIG_CRYPTO_DES=m
875CONFIG_CRYPTO_BLOWFISH=m 888CONFIG_CRYPTO_BLOWFISH=m
876CONFIG_CRYPTO_TWOFISH=m 889CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 37b30e42bd20..b501db51d9ec 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:04 2005 4# Tue Apr 5 14:06:19 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -201,6 +202,8 @@ CONFIG_DM_CRYPT=m
201CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
202CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
203CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
204 207
205# 208#
206# Fusion MPT device support 209# Fusion MPT device support
@@ -224,7 +227,6 @@ CONFIG_NET=y
224# 227#
225CONFIG_PACKET=y 228CONFIG_PACKET=y
226# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
227CONFIG_NETLINK_DEV=y
228CONFIG_UNIX=y 230CONFIG_UNIX=y
229CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
230CONFIG_INET=y 232CONFIG_INET=y
@@ -327,7 +329,7 @@ CONFIG_IP_NF_ARPFILTER=m
327CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
328 330
329# 331#
330# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
331# 333#
332CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
333CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -398,7 +400,6 @@ CONFIG_DUMMY=m
398# CONFIG_BONDING is not set 400# CONFIG_BONDING is not set
399CONFIG_EQUALIZER=m 401CONFIG_EQUALIZER=m
400# CONFIG_TUN is not set 402# CONFIG_TUN is not set
401# CONFIG_ETHERTAP is not set
402 403
403# 404#
404# Ethernet (10 or 100Mbit) 405# Ethernet (10 or 100Mbit)
@@ -471,17 +472,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
471# CONFIG_INPUT_EVBUG is not set 472# CONFIG_INPUT_EVBUG is not set
472 473
473# 474#
474# Input I/O drivers
475#
476# CONFIG_GAMEPORT is not set
477CONFIG_SOUND_GAMEPORT=y
478CONFIG_SERIO=m
479CONFIG_SERIO_SERPORT=m
480# CONFIG_SERIO_CT82C710 is not set
481CONFIG_SERIO_LIBPS2=m
482# CONFIG_SERIO_RAW is not set
483
484#
485# Input Device Drivers 475# Input Device Drivers
486# 476#
487CONFIG_INPUT_KEYBOARD=y 477CONFIG_INPUT_KEYBOARD=y
@@ -499,6 +489,16 @@ CONFIG_MOUSE_SERIAL=m
499# CONFIG_INPUT_MISC is not set 489# CONFIG_INPUT_MISC is not set
500 490
501# 491#
492# Hardware I/O ports
493#
494CONFIG_SERIO=m
495CONFIG_SERIO_SERPORT=m
496CONFIG_SERIO_LIBPS2=m
497# CONFIG_SERIO_RAW is not set
498# CONFIG_GAMEPORT is not set
499CONFIG_SOUND_GAMEPORT=y
500
501#
502# Character devices 502# Character devices
503# 503#
504CONFIG_VT=y 504CONFIG_VT=y
@@ -539,6 +539,10 @@ CONFIG_GEN_RTC_X=y
539# CONFIG_RAW_DRIVER is not set 539# CONFIG_RAW_DRIVER is not set
540 540
541# 541#
542# TPM devices
543#
544
545#
542# I2C support 546# I2C support
543# 547#
544# CONFIG_I2C is not set 548# CONFIG_I2C is not set
@@ -584,10 +588,6 @@ CONFIG_DUMMY_CONSOLE=y
584# CONFIG_USB_ARCH_HAS_OHCI is not set 588# CONFIG_USB_ARCH_HAS_OHCI is not set
585 589
586# 590#
587# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
588#
589
590#
591# USB Gadget Support 591# USB Gadget Support
592# 592#
593# CONFIG_USB_GADGET is not set 593# CONFIG_USB_GADGET is not set
@@ -787,14 +787,19 @@ CONFIG_NLS_UTF8=m
787# 787#
788# Kernel hacking 788# Kernel hacking
789# 789#
790# CONFIG_PRINTK_TIME is not set
790CONFIG_DEBUG_KERNEL=y 791CONFIG_DEBUG_KERNEL=y
791CONFIG_MAGIC_SYSRQ=y 792CONFIG_MAGIC_SYSRQ=y
793CONFIG_LOG_BUF_SHIFT=16
792# CONFIG_SCHEDSTATS is not set 794# CONFIG_SCHEDSTATS is not set
793# CONFIG_DEBUG_SLAB is not set 795# CONFIG_DEBUG_SLAB is not set
796# CONFIG_DEBUG_SPINLOCK is not set
797# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
794# CONFIG_DEBUG_KOBJECT is not set 798# CONFIG_DEBUG_KOBJECT is not set
795CONFIG_DEBUG_BUGVERBOSE=y 799CONFIG_DEBUG_BUGVERBOSE=y
796# CONFIG_DEBUG_INFO is not set 800# CONFIG_DEBUG_INFO is not set
797# CONFIG_DEBUG_FS is not set 801# CONFIG_DEBUG_FS is not set
802# CONFIG_FRAME_POINTER is not set
798 803
799# 804#
800# Security options 805# Security options
@@ -813,7 +818,8 @@ CONFIG_CRYPTO_MD5=y
813CONFIG_CRYPTO_SHA1=m 818CONFIG_CRYPTO_SHA1=m
814CONFIG_CRYPTO_SHA256=m 819CONFIG_CRYPTO_SHA256=m
815CONFIG_CRYPTO_SHA512=m 820CONFIG_CRYPTO_SHA512=m
816# CONFIG_CRYPTO_WP512 is not set 821CONFIG_CRYPTO_WP512=m
822CONFIG_CRYPTO_TGR192=m
817CONFIG_CRYPTO_DES=y 823CONFIG_CRYPTO_DES=y
818CONFIG_CRYPTO_BLOWFISH=m 824CONFIG_CRYPTO_BLOWFISH=m
819CONFIG_CRYPTO_TWOFISH=m 825CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 885e34d7d1ec..2bf6cef4f2b2 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:06 2005 4# Tue Apr 5 14:06:21 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -202,6 +203,8 @@ CONFIG_DM_CRYPT=m
202CONFIG_DM_SNAPSHOT=m 203CONFIG_DM_SNAPSHOT=m
203CONFIG_DM_MIRROR=m 204CONFIG_DM_MIRROR=m
204CONFIG_DM_ZERO=m 205CONFIG_DM_ZERO=m
206CONFIG_DM_MULTIPATH=m
207CONFIG_DM_MULTIPATH_EMC=m
205 208
206# 209#
207# Fusion MPT device support 210# Fusion MPT device support
@@ -225,7 +228,6 @@ CONFIG_NET=y
225# 228#
226CONFIG_PACKET=y 229CONFIG_PACKET=y
227# CONFIG_PACKET_MMAP is not set 230# CONFIG_PACKET_MMAP is not set
228CONFIG_NETLINK_DEV=y
229CONFIG_UNIX=y 231CONFIG_UNIX=y
230CONFIG_NET_KEY=y 232CONFIG_NET_KEY=y
231CONFIG_INET=y 233CONFIG_INET=y
@@ -328,7 +330,7 @@ CONFIG_IP_NF_ARPFILTER=m
328CONFIG_IP_NF_ARP_MANGLE=m 330CONFIG_IP_NF_ARP_MANGLE=m
329 331
330# 332#
331# IPv6: Netfilter Configuration 333# IPv6: Netfilter Configuration (EXPERIMENTAL)
332# 334#
333CONFIG_IP6_NF_QUEUE=m 335CONFIG_IP6_NF_QUEUE=m
334CONFIG_IP6_NF_IPTABLES=m 336CONFIG_IP6_NF_IPTABLES=m
@@ -400,7 +402,6 @@ CONFIG_DUMMY=m
400# CONFIG_BONDING is not set 402# CONFIG_BONDING is not set
401CONFIG_EQUALIZER=m 403CONFIG_EQUALIZER=m
402# CONFIG_TUN is not set 404# CONFIG_TUN is not set
403# CONFIG_ETHERTAP is not set
404 405
405# 406#
406# Ethernet (10 or 100Mbit) 407# Ethernet (10 or 100Mbit)
@@ -473,17 +474,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
473# CONFIG_INPUT_EVBUG is not set 474# CONFIG_INPUT_EVBUG is not set
474 475
475# 476#
476# Input I/O drivers
477#
478# CONFIG_GAMEPORT is not set
479CONFIG_SOUND_GAMEPORT=y
480CONFIG_SERIO=m
481CONFIG_SERIO_SERPORT=m
482# CONFIG_SERIO_CT82C710 is not set
483CONFIG_SERIO_LIBPS2=m
484# CONFIG_SERIO_RAW is not set
485
486#
487# Input Device Drivers 477# Input Device Drivers
488# 478#
489CONFIG_INPUT_KEYBOARD=y 479CONFIG_INPUT_KEYBOARD=y
@@ -501,6 +491,16 @@ CONFIG_MOUSE_SERIAL=m
501# CONFIG_INPUT_MISC is not set 491# CONFIG_INPUT_MISC is not set
502 492
503# 493#
494# Hardware I/O ports
495#
496CONFIG_SERIO=m
497CONFIG_SERIO_SERPORT=m
498CONFIG_SERIO_LIBPS2=m
499# CONFIG_SERIO_RAW is not set
500# CONFIG_GAMEPORT is not set
501CONFIG_SOUND_GAMEPORT=y
502
503#
504# Character devices 504# Character devices
505# 505#
506CONFIG_VT=y 506CONFIG_VT=y
@@ -541,6 +541,10 @@ CONFIG_GEN_RTC_X=y
541# CONFIG_RAW_DRIVER is not set 541# CONFIG_RAW_DRIVER is not set
542 542
543# 543#
544# TPM devices
545#
546
547#
544# I2C support 548# I2C support
545# 549#
546# CONFIG_I2C is not set 550# CONFIG_I2C is not set
@@ -586,10 +590,6 @@ CONFIG_DUMMY_CONSOLE=y
586# CONFIG_USB_ARCH_HAS_OHCI is not set 590# CONFIG_USB_ARCH_HAS_OHCI is not set
587 591
588# 592#
589# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
590#
591
592#
593# USB Gadget Support 593# USB Gadget Support
594# 594#
595# CONFIG_USB_GADGET is not set 595# CONFIG_USB_GADGET is not set
@@ -787,14 +787,19 @@ CONFIG_NLS_UTF8=m
787# 787#
788# Kernel hacking 788# Kernel hacking
789# 789#
790# CONFIG_PRINTK_TIME is not set
790CONFIG_DEBUG_KERNEL=y 791CONFIG_DEBUG_KERNEL=y
791CONFIG_MAGIC_SYSRQ=y 792CONFIG_MAGIC_SYSRQ=y
793CONFIG_LOG_BUF_SHIFT=16
792# CONFIG_SCHEDSTATS is not set 794# CONFIG_SCHEDSTATS is not set
793# CONFIG_DEBUG_SLAB is not set 795# CONFIG_DEBUG_SLAB is not set
796# CONFIG_DEBUG_SPINLOCK is not set
797# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
794# CONFIG_DEBUG_KOBJECT is not set 798# CONFIG_DEBUG_KOBJECT is not set
795CONFIG_DEBUG_BUGVERBOSE=y 799CONFIG_DEBUG_BUGVERBOSE=y
796# CONFIG_DEBUG_INFO is not set 800# CONFIG_DEBUG_INFO is not set
797# CONFIG_DEBUG_FS is not set 801# CONFIG_DEBUG_FS is not set
802# CONFIG_FRAME_POINTER is not set
798 803
799# 804#
800# Security options 805# Security options
@@ -813,7 +818,8 @@ CONFIG_CRYPTO_MD5=y
813CONFIG_CRYPTO_SHA1=m 818CONFIG_CRYPTO_SHA1=m
814CONFIG_CRYPTO_SHA256=m 819CONFIG_CRYPTO_SHA256=m
815CONFIG_CRYPTO_SHA512=m 820CONFIG_CRYPTO_SHA512=m
816# CONFIG_CRYPTO_WP512 is not set 821CONFIG_CRYPTO_WP512=m
822CONFIG_CRYPTO_TGR192=m
817CONFIG_CRYPTO_DES=y 823CONFIG_CRYPTO_DES=y
818CONFIG_CRYPTO_BLOWFISH=m 824CONFIG_CRYPTO_BLOWFISH=m
819CONFIG_CRYPTO_TWOFISH=m 825CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index e6f25cf483de..7074f856820c 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:08 2005 4# Tue Apr 5 14:06:24 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -228,6 +229,8 @@ CONFIG_DM_CRYPT=m
228CONFIG_DM_SNAPSHOT=m 229CONFIG_DM_SNAPSHOT=m
229CONFIG_DM_MIRROR=m 230CONFIG_DM_MIRROR=m
230CONFIG_DM_ZERO=m 231CONFIG_DM_ZERO=m
232CONFIG_DM_MULTIPATH=m
233CONFIG_DM_MULTIPATH_EMC=m
231 234
232# 235#
233# Fusion MPT device support 236# Fusion MPT device support
@@ -263,7 +266,6 @@ CONFIG_NET=y
263# 266#
264CONFIG_PACKET=y 267CONFIG_PACKET=y
265# CONFIG_PACKET_MMAP is not set 268# CONFIG_PACKET_MMAP is not set
266CONFIG_NETLINK_DEV=y
267CONFIG_UNIX=y 269CONFIG_UNIX=y
268CONFIG_NET_KEY=y 270CONFIG_NET_KEY=y
269CONFIG_INET=y 271CONFIG_INET=y
@@ -363,7 +365,7 @@ CONFIG_IP_NF_ARPFILTER=m
363CONFIG_IP_NF_ARP_MANGLE=m 365CONFIG_IP_NF_ARP_MANGLE=m
364 366
365# 367#
366# IPv6: Netfilter Configuration 368# IPv6: Netfilter Configuration (EXPERIMENTAL)
367# 369#
368CONFIG_IP6_NF_QUEUE=m 370CONFIG_IP6_NF_QUEUE=m
369CONFIG_IP6_NF_IPTABLES=m 371CONFIG_IP6_NF_IPTABLES=m
@@ -438,7 +440,6 @@ CONFIG_DUMMY=m
438# CONFIG_BONDING is not set 440# CONFIG_BONDING is not set
439CONFIG_EQUALIZER=m 441CONFIG_EQUALIZER=m
440# CONFIG_TUN is not set 442# CONFIG_TUN is not set
441# CONFIG_ETHERTAP is not set
442 443
443# 444#
444# Ethernet (10 or 100Mbit) 445# Ethernet (10 or 100Mbit)
@@ -515,17 +516,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
515# CONFIG_INPUT_EVBUG is not set 516# CONFIG_INPUT_EVBUG is not set
516 517
517# 518#
518# Input I/O drivers
519#
520# CONFIG_GAMEPORT is not set
521CONFIG_SOUND_GAMEPORT=y
522CONFIG_SERIO=m
523CONFIG_SERIO_SERPORT=m
524# CONFIG_SERIO_CT82C710 is not set
525CONFIG_SERIO_LIBPS2=m
526# CONFIG_SERIO_RAW is not set
527
528#
529# Input Device Drivers 519# Input Device Drivers
530# 520#
531CONFIG_INPUT_KEYBOARD=y 521CONFIG_INPUT_KEYBOARD=y
@@ -543,6 +533,16 @@ CONFIG_MOUSE_SERIAL=m
543# CONFIG_INPUT_MISC is not set 533# CONFIG_INPUT_MISC is not set
544 534
545# 535#
536# Hardware I/O ports
537#
538CONFIG_SERIO=m
539CONFIG_SERIO_SERPORT=m
540CONFIG_SERIO_LIBPS2=m
541# CONFIG_SERIO_RAW is not set
542# CONFIG_GAMEPORT is not set
543CONFIG_SOUND_GAMEPORT=y
544
545#
546# Character devices 546# Character devices
547# 547#
548CONFIG_VT=y 548CONFIG_VT=y
@@ -583,6 +583,10 @@ CONFIG_GEN_RTC_X=y
583# CONFIG_RAW_DRIVER is not set 583# CONFIG_RAW_DRIVER is not set
584 584
585# 585#
586# TPM devices
587#
588
589#
586# I2C support 590# I2C support
587# 591#
588# CONFIG_I2C is not set 592# CONFIG_I2C is not set
@@ -610,10 +614,16 @@ CONFIG_GEN_RTC_X=y
610# Graphics support 614# Graphics support
611# 615#
612CONFIG_FB=y 616CONFIG_FB=y
617CONFIG_FB_CFB_FILLRECT=y
618CONFIG_FB_CFB_COPYAREA=y
619CONFIG_FB_CFB_IMAGEBLIT=y
620CONFIG_FB_SOFT_CURSOR=y
621CONFIG_FB_MACMODES=y
613CONFIG_FB_MODE_HELPERS=y 622CONFIG_FB_MODE_HELPERS=y
614# CONFIG_FB_TILEBLITTING is not set 623# CONFIG_FB_TILEBLITTING is not set
615CONFIG_FB_VALKYRIE=y 624CONFIG_FB_VALKYRIE=y
616CONFIG_FB_MAC=y 625CONFIG_FB_MAC=y
626# CONFIG_FB_S1D13XXX is not set
617# CONFIG_FB_VIRTUAL is not set 627# CONFIG_FB_VIRTUAL is not set
618 628
619# 629#
@@ -648,10 +658,6 @@ CONFIG_LOGO_MAC_CLUT224=y
648# CONFIG_USB_ARCH_HAS_OHCI is not set 658# CONFIG_USB_ARCH_HAS_OHCI is not set
649 659
650# 660#
651# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
652#
653
654#
655# USB Gadget Support 661# USB Gadget Support
656# 662#
657# CONFIG_USB_GADGET is not set 663# CONFIG_USB_GADGET is not set
@@ -862,19 +868,24 @@ CONFIG_NLS_ISO8859_14=m
862CONFIG_NLS_ISO8859_15=m 868CONFIG_NLS_ISO8859_15=m
863CONFIG_NLS_KOI8_R=m 869CONFIG_NLS_KOI8_R=m
864CONFIG_NLS_KOI8_U=m 870CONFIG_NLS_KOI8_U=m
865CONFIG_NLS_UTF8=m 871CONFIG_NLS_UTF8=y
866 872
867# 873#
868# Kernel hacking 874# Kernel hacking
869# 875#
876# CONFIG_PRINTK_TIME is not set
870CONFIG_DEBUG_KERNEL=y 877CONFIG_DEBUG_KERNEL=y
871CONFIG_MAGIC_SYSRQ=y 878CONFIG_MAGIC_SYSRQ=y
879CONFIG_LOG_BUF_SHIFT=16
872# CONFIG_SCHEDSTATS is not set 880# CONFIG_SCHEDSTATS is not set
873# CONFIG_DEBUG_SLAB is not set 881# CONFIG_DEBUG_SLAB is not set
882# CONFIG_DEBUG_SPINLOCK is not set
883# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
874# CONFIG_DEBUG_KOBJECT is not set 884# CONFIG_DEBUG_KOBJECT is not set
875CONFIG_DEBUG_BUGVERBOSE=y 885CONFIG_DEBUG_BUGVERBOSE=y
876# CONFIG_DEBUG_INFO is not set 886# CONFIG_DEBUG_INFO is not set
877# CONFIG_DEBUG_FS is not set 887# CONFIG_DEBUG_FS is not set
888# CONFIG_FRAME_POINTER is not set
878 889
879# 890#
880# Security options 891# Security options
@@ -893,7 +904,8 @@ CONFIG_CRYPTO_MD5=y
893CONFIG_CRYPTO_SHA1=m 904CONFIG_CRYPTO_SHA1=m
894CONFIG_CRYPTO_SHA256=m 905CONFIG_CRYPTO_SHA256=m
895CONFIG_CRYPTO_SHA512=m 906CONFIG_CRYPTO_SHA512=m
896# CONFIG_CRYPTO_WP512 is not set 907CONFIG_CRYPTO_WP512=m
908CONFIG_CRYPTO_TGR192=m
897CONFIG_CRYPTO_DES=m 909CONFIG_CRYPTO_DES=m
898CONFIG_CRYPTO_BLOWFISH=m 910CONFIG_CRYPTO_BLOWFISH=m
899CONFIG_CRYPTO_TWOFISH=m 911CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 4104705628ad..61f09bc4846a 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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:09 2005 4# Tue Apr 5 14:06:28 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -202,6 +203,8 @@ CONFIG_DM_CRYPT=m
202CONFIG_DM_SNAPSHOT=m 203CONFIG_DM_SNAPSHOT=m
203CONFIG_DM_MIRROR=m 204CONFIG_DM_MIRROR=m
204CONFIG_DM_ZERO=m 205CONFIG_DM_ZERO=m
206CONFIG_DM_MULTIPATH=m
207CONFIG_DM_MULTIPATH_EMC=m
205 208
206# 209#
207# Fusion MPT device support 210# Fusion MPT device support
@@ -225,7 +228,6 @@ CONFIG_NET=y
225# 228#
226CONFIG_PACKET=y 229CONFIG_PACKET=y
227# CONFIG_PACKET_MMAP is not set 230# CONFIG_PACKET_MMAP is not set
228CONFIG_NETLINK_DEV=y
229CONFIG_UNIX=y 231CONFIG_UNIX=y
230CONFIG_NET_KEY=y 232CONFIG_NET_KEY=y
231CONFIG_INET=y 233CONFIG_INET=y
@@ -328,7 +330,7 @@ CONFIG_IP_NF_ARPFILTER=m
328CONFIG_IP_NF_ARP_MANGLE=m 330CONFIG_IP_NF_ARP_MANGLE=m
329 331
330# 332#
331# IPv6: Netfilter Configuration 333# IPv6: Netfilter Configuration (EXPERIMENTAL)
332# 334#
333CONFIG_IP6_NF_QUEUE=m 335CONFIG_IP6_NF_QUEUE=m
334CONFIG_IP6_NF_IPTABLES=m 336CONFIG_IP6_NF_IPTABLES=m
@@ -400,7 +402,6 @@ CONFIG_DUMMY=m
400# CONFIG_BONDING is not set 402# CONFIG_BONDING is not set
401CONFIG_EQUALIZER=m 403CONFIG_EQUALIZER=m
402# CONFIG_TUN is not set 404# CONFIG_TUN is not set
403# CONFIG_ETHERTAP is not set
404 405
405# 406#
406# Ethernet (10 or 100Mbit) 407# Ethernet (10 or 100Mbit)
@@ -473,17 +474,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
473# CONFIG_INPUT_EVBUG is not set 474# CONFIG_INPUT_EVBUG is not set
474 475
475# 476#
476# Input I/O drivers
477#
478# CONFIG_GAMEPORT is not set
479CONFIG_SOUND_GAMEPORT=y
480CONFIG_SERIO=m
481CONFIG_SERIO_SERPORT=m
482# CONFIG_SERIO_CT82C710 is not set
483CONFIG_SERIO_LIBPS2=m
484# CONFIG_SERIO_RAW is not set
485
486#
487# Input Device Drivers 477# Input Device Drivers
488# 478#
489CONFIG_INPUT_KEYBOARD=y 479CONFIG_INPUT_KEYBOARD=y
@@ -501,6 +491,16 @@ CONFIG_MOUSE_SERIAL=m
501# CONFIG_INPUT_MISC is not set 491# CONFIG_INPUT_MISC is not set
502 492
503# 493#
494# Hardware I/O ports
495#
496CONFIG_SERIO=m
497CONFIG_SERIO_SERPORT=m
498CONFIG_SERIO_LIBPS2=m
499# CONFIG_SERIO_RAW is not set
500# CONFIG_GAMEPORT is not set
501CONFIG_SOUND_GAMEPORT=y
502
503#
504# Character devices 504# Character devices
505# 505#
506CONFIG_VT=y 506CONFIG_VT=y
@@ -541,6 +541,10 @@ CONFIG_GEN_RTC_X=y
541# CONFIG_RAW_DRIVER is not set 541# CONFIG_RAW_DRIVER is not set
542 542
543# 543#
544# TPM devices
545#
546
547#
544# I2C support 548# I2C support
545# 549#
546# CONFIG_I2C is not set 550# CONFIG_I2C is not set
@@ -568,8 +572,14 @@ CONFIG_GEN_RTC_X=y
568# Graphics support 572# Graphics support
569# 573#
570CONFIG_FB=y 574CONFIG_FB=y
575# CONFIG_FB_CFB_FILLRECT is not set
576# CONFIG_FB_CFB_COPYAREA is not set
577# CONFIG_FB_CFB_IMAGEBLIT is not set
578# CONFIG_FB_SOFT_CURSOR is not set
579# CONFIG_FB_MACMODES is not set
571CONFIG_FB_MODE_HELPERS=y 580CONFIG_FB_MODE_HELPERS=y
572# CONFIG_FB_TILEBLITTING is not set 581# CONFIG_FB_TILEBLITTING is not set
582# CONFIG_FB_S1D13XXX is not set
573# CONFIG_FB_VIRTUAL is not set 583# CONFIG_FB_VIRTUAL is not set
574 584
575# 585#
@@ -602,10 +612,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
602# CONFIG_USB_ARCH_HAS_OHCI is not set 612# CONFIG_USB_ARCH_HAS_OHCI is not set
603 613
604# 614#
605# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
606#
607
608#
609# USB Gadget Support 615# USB Gadget Support
610# 616#
611# CONFIG_USB_GADGET is not set 617# CONFIG_USB_GADGET is not set
@@ -807,14 +813,19 @@ CONFIG_NLS_UTF8=m
807# 813#
808# Kernel hacking 814# Kernel hacking
809# 815#
816# CONFIG_PRINTK_TIME is not set
810CONFIG_DEBUG_KERNEL=y 817CONFIG_DEBUG_KERNEL=y
811CONFIG_MAGIC_SYSRQ=y 818CONFIG_MAGIC_SYSRQ=y
819CONFIG_LOG_BUF_SHIFT=16
812# CONFIG_SCHEDSTATS is not set 820# CONFIG_SCHEDSTATS is not set
813# CONFIG_DEBUG_SLAB is not set 821# CONFIG_DEBUG_SLAB is not set
822# CONFIG_DEBUG_SPINLOCK is not set
823# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
814# CONFIG_DEBUG_KOBJECT is not set 824# CONFIG_DEBUG_KOBJECT is not set
815CONFIG_DEBUG_BUGVERBOSE=y 825CONFIG_DEBUG_BUGVERBOSE=y
816# CONFIG_DEBUG_INFO is not set 826# CONFIG_DEBUG_INFO is not set
817# CONFIG_DEBUG_FS is not set 827# CONFIG_DEBUG_FS is not set
828# CONFIG_FRAME_POINTER is not set
818 829
819# 830#
820# Security options 831# Security options
@@ -833,7 +844,8 @@ CONFIG_CRYPTO_MD5=y
833CONFIG_CRYPTO_SHA1=m 844CONFIG_CRYPTO_SHA1=m
834CONFIG_CRYPTO_SHA256=m 845CONFIG_CRYPTO_SHA256=m
835CONFIG_CRYPTO_SHA512=m 846CONFIG_CRYPTO_SHA512=m
836# CONFIG_CRYPTO_WP512 is not set 847CONFIG_CRYPTO_WP512=m
848CONFIG_CRYPTO_TGR192=m
837CONFIG_CRYPTO_DES=y 849CONFIG_CRYPTO_DES=y
838CONFIG_CRYPTO_BLOWFISH=m 850CONFIG_CRYPTO_BLOWFISH=m
839CONFIG_CRYPTO_TWOFISH=m 851CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index ee776117ff6f..69c01004ec41 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:11 2005 4# Tue Apr 5 14:06:31 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -201,6 +202,8 @@ CONFIG_DM_CRYPT=m
201CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
202CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
203CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
204 207
205# 208#
206# Fusion MPT device support 209# Fusion MPT device support
@@ -224,7 +227,6 @@ CONFIG_NET=y
224# 227#
225CONFIG_PACKET=y 228CONFIG_PACKET=y
226# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
227CONFIG_NETLINK_DEV=y
228CONFIG_UNIX=y 230CONFIG_UNIX=y
229CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
230CONFIG_INET=y 232CONFIG_INET=y
@@ -327,7 +329,7 @@ CONFIG_IP_NF_ARPFILTER=m
327CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
328 330
329# 331#
330# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
331# 333#
332CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
333CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -399,7 +401,6 @@ CONFIG_DUMMY=m
399# CONFIG_BONDING is not set 401# CONFIG_BONDING is not set
400CONFIG_EQUALIZER=m 402CONFIG_EQUALIZER=m
401# CONFIG_TUN is not set 403# CONFIG_TUN is not set
402# CONFIG_ETHERTAP is not set
403 404
404# 405#
405# Ethernet (10 or 100Mbit) 406# Ethernet (10 or 100Mbit)
@@ -472,17 +473,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
472# CONFIG_INPUT_EVBUG is not set 473# CONFIG_INPUT_EVBUG is not set
473 474
474# 475#
475# Input I/O drivers
476#
477# CONFIG_GAMEPORT is not set
478CONFIG_SOUND_GAMEPORT=y
479CONFIG_SERIO=m
480CONFIG_SERIO_SERPORT=m
481# CONFIG_SERIO_CT82C710 is not set
482CONFIG_SERIO_LIBPS2=m
483# CONFIG_SERIO_RAW is not set
484
485#
486# Input Device Drivers 476# Input Device Drivers
487# 477#
488CONFIG_INPUT_KEYBOARD=y 478CONFIG_INPUT_KEYBOARD=y
@@ -500,6 +490,16 @@ CONFIG_MOUSE_SERIAL=m
500# CONFIG_INPUT_MISC is not set 490# CONFIG_INPUT_MISC is not set
501 491
502# 492#
493# Hardware I/O ports
494#
495CONFIG_SERIO=m
496CONFIG_SERIO_SERPORT=m
497CONFIG_SERIO_LIBPS2=m
498# CONFIG_SERIO_RAW is not set
499# CONFIG_GAMEPORT is not set
500CONFIG_SOUND_GAMEPORT=y
501
502#
503# Character devices 503# Character devices
504# 504#
505CONFIG_VT=y 505CONFIG_VT=y
@@ -540,6 +540,10 @@ CONFIG_GEN_RTC_X=y
540# CONFIG_RAW_DRIVER is not set 540# CONFIG_RAW_DRIVER is not set
541 541
542# 542#
543# TPM devices
544#
545
546#
543# I2C support 547# I2C support
544# 548#
545# CONFIG_I2C is not set 549# CONFIG_I2C is not set
@@ -567,8 +571,14 @@ CONFIG_GEN_RTC_X=y
567# Graphics support 571# Graphics support
568# 572#
569CONFIG_FB=y 573CONFIG_FB=y
574# CONFIG_FB_CFB_FILLRECT is not set
575# CONFIG_FB_CFB_COPYAREA is not set
576# CONFIG_FB_CFB_IMAGEBLIT is not set
577# CONFIG_FB_SOFT_CURSOR is not set
578# CONFIG_FB_MACMODES is not set
570CONFIG_FB_MODE_HELPERS=y 579CONFIG_FB_MODE_HELPERS=y
571# CONFIG_FB_TILEBLITTING is not set 580# CONFIG_FB_TILEBLITTING is not set
581# CONFIG_FB_S1D13XXX is not set
572# CONFIG_FB_VIRTUAL is not set 582# CONFIG_FB_VIRTUAL is not set
573 583
574# 584#
@@ -601,10 +611,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
601# CONFIG_USB_ARCH_HAS_OHCI is not set 611# CONFIG_USB_ARCH_HAS_OHCI is not set
602 612
603# 613#
604# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
605#
606
607#
608# USB Gadget Support 614# USB Gadget Support
609# 615#
610# CONFIG_USB_GADGET is not set 616# CONFIG_USB_GADGET is not set
@@ -806,14 +812,19 @@ CONFIG_NLS_UTF8=m
806# 812#
807# Kernel hacking 813# Kernel hacking
808# 814#
815# CONFIG_PRINTK_TIME is not set
809CONFIG_DEBUG_KERNEL=y 816CONFIG_DEBUG_KERNEL=y
810CONFIG_MAGIC_SYSRQ=y 817CONFIG_MAGIC_SYSRQ=y
818CONFIG_LOG_BUF_SHIFT=16
811# CONFIG_SCHEDSTATS is not set 819# CONFIG_SCHEDSTATS is not set
812# CONFIG_DEBUG_SLAB is not set 820# CONFIG_DEBUG_SLAB is not set
821# CONFIG_DEBUG_SPINLOCK is not set
822# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
813# CONFIG_DEBUG_KOBJECT is not set 823# CONFIG_DEBUG_KOBJECT is not set
814CONFIG_DEBUG_BUGVERBOSE=y 824CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_DEBUG_INFO is not set 825# CONFIG_DEBUG_INFO is not set
816# CONFIG_DEBUG_FS is not set 826# CONFIG_DEBUG_FS is not set
827# CONFIG_FRAME_POINTER is not set
817 828
818# 829#
819# Security options 830# Security options
@@ -832,7 +843,8 @@ CONFIG_CRYPTO_MD5=y
832CONFIG_CRYPTO_SHA1=m 843CONFIG_CRYPTO_SHA1=m
833CONFIG_CRYPTO_SHA256=m 844CONFIG_CRYPTO_SHA256=m
834CONFIG_CRYPTO_SHA512=m 845CONFIG_CRYPTO_SHA512=m
835# CONFIG_CRYPTO_WP512 is not set 846CONFIG_CRYPTO_WP512=m
847CONFIG_CRYPTO_TGR192=m
836CONFIG_CRYPTO_DES=y 848CONFIG_CRYPTO_DES=y
837CONFIG_CRYPTO_BLOWFISH=m 849CONFIG_CRYPTO_BLOWFISH=m
838CONFIG_CRYPTO_TWOFISH=m 850CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 85df1b02af41..550ec26006c1 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:12 2005 4# Tue Apr 5 14:06:34 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -218,7 +219,6 @@ CONFIG_SCSI_CONSTANTS=y
218# CONFIG_SCSI_BUSLOGIC is not set 219# CONFIG_SCSI_BUSLOGIC is not set
219# CONFIG_SCSI_DTC3280 is not set 220# CONFIG_SCSI_DTC3280 is not set
220# CONFIG_SCSI_EATA is not set 221# CONFIG_SCSI_EATA is not set
221# CONFIG_SCSI_EATA_PIO is not set
222# CONFIG_SCSI_FUTURE_DOMAIN is not set 222# CONFIG_SCSI_FUTURE_DOMAIN is not set
223# CONFIG_SCSI_GDTH is not set 223# CONFIG_SCSI_GDTH is not set
224# CONFIG_SCSI_GENERIC_NCR5380 is not set 224# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -255,6 +255,8 @@ CONFIG_DM_CRYPT=m
255CONFIG_DM_SNAPSHOT=m 255CONFIG_DM_SNAPSHOT=m
256CONFIG_DM_MIRROR=m 256CONFIG_DM_MIRROR=m
257CONFIG_DM_ZERO=m 257CONFIG_DM_ZERO=m
258CONFIG_DM_MULTIPATH=m
259CONFIG_DM_MULTIPATH_EMC=m
258 260
259# 261#
260# Fusion MPT device support 262# Fusion MPT device support
@@ -278,7 +280,6 @@ CONFIG_NET=y
278# 280#
279CONFIG_PACKET=y 281CONFIG_PACKET=y
280# CONFIG_PACKET_MMAP is not set 282# CONFIG_PACKET_MMAP is not set
281CONFIG_NETLINK_DEV=y
282CONFIG_UNIX=y 283CONFIG_UNIX=y
283CONFIG_NET_KEY=y 284CONFIG_NET_KEY=y
284CONFIG_INET=y 285CONFIG_INET=y
@@ -381,7 +382,7 @@ CONFIG_IP_NF_ARPFILTER=m
381CONFIG_IP_NF_ARP_MANGLE=m 382CONFIG_IP_NF_ARP_MANGLE=m
382 383
383# 384#
384# IPv6: Netfilter Configuration 385# IPv6: Netfilter Configuration (EXPERIMENTAL)
385# 386#
386CONFIG_IP6_NF_QUEUE=m 387CONFIG_IP6_NF_QUEUE=m
387CONFIG_IP6_NF_IPTABLES=m 388CONFIG_IP6_NF_IPTABLES=m
@@ -453,7 +454,6 @@ CONFIG_DUMMY=m
453# CONFIG_BONDING is not set 454# CONFIG_BONDING is not set
454CONFIG_EQUALIZER=m 455CONFIG_EQUALIZER=m
455# CONFIG_TUN is not set 456# CONFIG_TUN is not set
456# CONFIG_ETHERTAP is not set
457 457
458# 458#
459# ARCnet devices 459# ARCnet devices
@@ -542,18 +542,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
542# CONFIG_INPUT_EVBUG is not set 542# CONFIG_INPUT_EVBUG is not set
543 543
544# 544#
545# Input I/O drivers
546#
547# CONFIG_GAMEPORT is not set
548CONFIG_SOUND_GAMEPORT=y
549CONFIG_SERIO=m
550CONFIG_SERIO_SERPORT=m
551# CONFIG_SERIO_CT82C710 is not set
552CONFIG_SERIO_Q40KBD=m
553CONFIG_SERIO_LIBPS2=m
554# CONFIG_SERIO_RAW is not set
555
556#
557# Input Device Drivers 545# Input Device Drivers
558# 546#
559CONFIG_INPUT_KEYBOARD=y 547CONFIG_INPUT_KEYBOARD=y
@@ -574,6 +562,17 @@ CONFIG_MOUSE_SERIAL=m
574# CONFIG_INPUT_MISC is not set 562# CONFIG_INPUT_MISC is not set
575 563
576# 564#
565# Hardware I/O ports
566#
567CONFIG_SERIO=m
568CONFIG_SERIO_SERPORT=m
569CONFIG_SERIO_Q40KBD=m
570CONFIG_SERIO_LIBPS2=m
571# CONFIG_SERIO_RAW is not set
572# CONFIG_GAMEPORT is not set
573CONFIG_SOUND_GAMEPORT=y
574
575#
577# Character devices 576# Character devices
578# 577#
579CONFIG_VT=y 578CONFIG_VT=y
@@ -614,6 +613,10 @@ CONFIG_GEN_RTC_X=y
614# CONFIG_RAW_DRIVER is not set 613# CONFIG_RAW_DRIVER is not set
615 614
616# 615#
616# TPM devices
617#
618
619#
617# I2C support 620# I2C support
618# 621#
619# CONFIG_I2C is not set 622# CONFIG_I2C is not set
@@ -641,9 +644,15 @@ CONFIG_GEN_RTC_X=y
641# Graphics support 644# Graphics support
642# 645#
643CONFIG_FB=y 646CONFIG_FB=y
647CONFIG_FB_CFB_FILLRECT=y
648CONFIG_FB_CFB_COPYAREA=y
649CONFIG_FB_CFB_IMAGEBLIT=y
650CONFIG_FB_SOFT_CURSOR=y
651# CONFIG_FB_MACMODES is not set
644CONFIG_FB_MODE_HELPERS=y 652CONFIG_FB_MODE_HELPERS=y
645# CONFIG_FB_TILEBLITTING is not set 653# CONFIG_FB_TILEBLITTING is not set
646CONFIG_FB_Q40=y 654CONFIG_FB_Q40=y
655# CONFIG_FB_S1D13XXX is not set
647# CONFIG_FB_VIRTUAL is not set 656# CONFIG_FB_VIRTUAL is not set
648 657
649# 658#
@@ -678,10 +687,6 @@ CONFIG_DMASOUND=y
678# CONFIG_USB_ARCH_HAS_OHCI is not set 687# CONFIG_USB_ARCH_HAS_OHCI is not set
679 688
680# 689#
681# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
682#
683
684#
685# USB Gadget Support 690# USB Gadget Support
686# 691#
687# CONFIG_USB_GADGET is not set 692# CONFIG_USB_GADGET is not set
@@ -879,14 +884,19 @@ CONFIG_NLS_UTF8=m
879# 884#
880# Kernel hacking 885# Kernel hacking
881# 886#
887# CONFIG_PRINTK_TIME is not set
882CONFIG_DEBUG_KERNEL=y 888CONFIG_DEBUG_KERNEL=y
883CONFIG_MAGIC_SYSRQ=y 889CONFIG_MAGIC_SYSRQ=y
890CONFIG_LOG_BUF_SHIFT=16
884# CONFIG_SCHEDSTATS is not set 891# CONFIG_SCHEDSTATS is not set
885# CONFIG_DEBUG_SLAB is not set 892# CONFIG_DEBUG_SLAB is not set
893# CONFIG_DEBUG_SPINLOCK is not set
894# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
886# CONFIG_DEBUG_KOBJECT is not set 895# CONFIG_DEBUG_KOBJECT is not set
887CONFIG_DEBUG_BUGVERBOSE=y 896CONFIG_DEBUG_BUGVERBOSE=y
888# CONFIG_DEBUG_INFO is not set 897# CONFIG_DEBUG_INFO is not set
889# CONFIG_DEBUG_FS is not set 898# CONFIG_DEBUG_FS is not set
899# CONFIG_FRAME_POINTER is not set
890 900
891# 901#
892# Security options 902# Security options
@@ -905,7 +915,8 @@ CONFIG_CRYPTO_MD5=y
905CONFIG_CRYPTO_SHA1=m 915CONFIG_CRYPTO_SHA1=m
906CONFIG_CRYPTO_SHA256=m 916CONFIG_CRYPTO_SHA256=m
907CONFIG_CRYPTO_SHA512=m 917CONFIG_CRYPTO_SHA512=m
908# CONFIG_CRYPTO_WP512 is not set 918CONFIG_CRYPTO_WP512=m
919CONFIG_CRYPTO_TGR192=m
909CONFIG_CRYPTO_DES=y 920CONFIG_CRYPTO_DES=y
910CONFIG_CRYPTO_BLOWFISH=m 921CONFIG_CRYPTO_BLOWFISH=m
911CONFIG_CRYPTO_TWOFISH=m 922CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 28d3891a6bcf..5b5a619645aa 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:14 2005 4# Tue Apr 5 14:06:37 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -190,6 +191,8 @@ CONFIG_DM_CRYPT=m
190CONFIG_DM_SNAPSHOT=m 191CONFIG_DM_SNAPSHOT=m
191CONFIG_DM_MIRROR=m 192CONFIG_DM_MIRROR=m
192CONFIG_DM_ZERO=m 193CONFIG_DM_ZERO=m
194CONFIG_DM_MULTIPATH=m
195CONFIG_DM_MULTIPATH_EMC=m
193 196
194# 197#
195# Fusion MPT device support 198# Fusion MPT device support
@@ -213,7 +216,6 @@ CONFIG_NET=y
213# 216#
214CONFIG_PACKET=y 217CONFIG_PACKET=y
215# CONFIG_PACKET_MMAP is not set 218# CONFIG_PACKET_MMAP is not set
216CONFIG_NETLINK_DEV=y
217CONFIG_UNIX=y 219CONFIG_UNIX=y
218CONFIG_NET_KEY=y 220CONFIG_NET_KEY=y
219CONFIG_INET=y 221CONFIG_INET=y
@@ -316,7 +318,7 @@ CONFIG_IP_NF_ARPFILTER=m
316CONFIG_IP_NF_ARP_MANGLE=m 318CONFIG_IP_NF_ARP_MANGLE=m
317 319
318# 320#
319# IPv6: Netfilter Configuration 321# IPv6: Netfilter Configuration (EXPERIMENTAL)
320# 322#
321CONFIG_IP6_NF_QUEUE=m 323CONFIG_IP6_NF_QUEUE=m
322CONFIG_IP6_NF_IPTABLES=m 324CONFIG_IP6_NF_IPTABLES=m
@@ -388,7 +390,6 @@ CONFIG_DUMMY=m
388# CONFIG_BONDING is not set 390# CONFIG_BONDING is not set
389CONFIG_EQUALIZER=m 391CONFIG_EQUALIZER=m
390# CONFIG_TUN is not set 392# CONFIG_TUN is not set
391# CONFIG_ETHERTAP is not set
392 393
393# 394#
394# Ethernet (10 or 100Mbit) 395# Ethernet (10 or 100Mbit)
@@ -462,17 +463,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
462# CONFIG_INPUT_EVBUG is not set 463# CONFIG_INPUT_EVBUG is not set
463 464
464# 465#
465# Input I/O drivers
466#
467# CONFIG_GAMEPORT is not set
468CONFIG_SOUND_GAMEPORT=y
469CONFIG_SERIO=y
470CONFIG_SERIO_SERPORT=m
471# CONFIG_SERIO_CT82C710 is not set
472CONFIG_SERIO_LIBPS2=m
473# CONFIG_SERIO_RAW is not set
474
475#
476# Input Device Drivers 466# Input Device Drivers
477# 467#
478CONFIG_INPUT_KEYBOARD=y 468CONFIG_INPUT_KEYBOARD=y
@@ -490,6 +480,16 @@ CONFIG_MOUSE_SERIAL=m
490# CONFIG_INPUT_MISC is not set 480# CONFIG_INPUT_MISC is not set
491 481
492# 482#
483# Hardware I/O ports
484#
485CONFIG_SERIO=y
486CONFIG_SERIO_SERPORT=m
487CONFIG_SERIO_LIBPS2=m
488# CONFIG_SERIO_RAW is not set
489# CONFIG_GAMEPORT is not set
490CONFIG_SOUND_GAMEPORT=y
491
492#
493# Character devices 493# Character devices
494# 494#
495CONFIG_VT=y 495CONFIG_VT=y
@@ -530,6 +530,10 @@ CONFIG_GEN_RTC_X=y
530# CONFIG_RAW_DRIVER is not set 530# CONFIG_RAW_DRIVER is not set
531 531
532# 532#
533# TPM devices
534#
535
536#
533# I2C support 537# I2C support
534# 538#
535# CONFIG_I2C is not set 539# CONFIG_I2C is not set
@@ -557,8 +561,14 @@ CONFIG_GEN_RTC_X=y
557# Graphics support 561# Graphics support
558# 562#
559CONFIG_FB=y 563CONFIG_FB=y
564# CONFIG_FB_CFB_FILLRECT is not set
565# CONFIG_FB_CFB_COPYAREA is not set
566# CONFIG_FB_CFB_IMAGEBLIT is not set
567# CONFIG_FB_SOFT_CURSOR is not set
568# CONFIG_FB_MACMODES is not set
560CONFIG_FB_MODE_HELPERS=y 569CONFIG_FB_MODE_HELPERS=y
561# CONFIG_FB_TILEBLITTING is not set 570# CONFIG_FB_TILEBLITTING is not set
571# CONFIG_FB_S1D13XXX is not set
562# CONFIG_FB_VIRTUAL is not set 572# CONFIG_FB_VIRTUAL is not set
563 573
564# 574#
@@ -591,10 +601,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
591# CONFIG_USB_ARCH_HAS_OHCI is not set 601# CONFIG_USB_ARCH_HAS_OHCI is not set
592 602
593# 603#
594# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
595#
596
597#
598# USB Gadget Support 604# USB Gadget Support
599# 605#
600# CONFIG_USB_GADGET is not set 606# CONFIG_USB_GADGET is not set
@@ -795,14 +801,19 @@ CONFIG_NLS_UTF8=m
795# 801#
796# Kernel hacking 802# Kernel hacking
797# 803#
804# CONFIG_PRINTK_TIME is not set
798CONFIG_DEBUG_KERNEL=y 805CONFIG_DEBUG_KERNEL=y
799CONFIG_MAGIC_SYSRQ=y 806CONFIG_MAGIC_SYSRQ=y
807CONFIG_LOG_BUF_SHIFT=16
800# CONFIG_SCHEDSTATS is not set 808# CONFIG_SCHEDSTATS is not set
801# CONFIG_DEBUG_SLAB is not set 809# CONFIG_DEBUG_SLAB is not set
810# CONFIG_DEBUG_SPINLOCK is not set
811# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
802# CONFIG_DEBUG_KOBJECT is not set 812# CONFIG_DEBUG_KOBJECT is not set
803CONFIG_DEBUG_BUGVERBOSE=y 813CONFIG_DEBUG_BUGVERBOSE=y
804# CONFIG_DEBUG_INFO is not set 814# CONFIG_DEBUG_INFO is not set
805# CONFIG_DEBUG_FS is not set 815# CONFIG_DEBUG_FS is not set
816# CONFIG_FRAME_POINTER is not set
806 817
807# 818#
808# Security options 819# Security options
@@ -821,7 +832,8 @@ CONFIG_CRYPTO_MD5=y
821CONFIG_CRYPTO_SHA1=m 832CONFIG_CRYPTO_SHA1=m
822CONFIG_CRYPTO_SHA256=m 833CONFIG_CRYPTO_SHA256=m
823CONFIG_CRYPTO_SHA512=m 834CONFIG_CRYPTO_SHA512=m
824# CONFIG_CRYPTO_WP512 is not set 835CONFIG_CRYPTO_WP512=m
836CONFIG_CRYPTO_TGR192=m
825CONFIG_CRYPTO_DES=y 837CONFIG_CRYPTO_DES=y
826CONFIG_CRYPTO_BLOWFISH=m 838CONFIG_CRYPTO_BLOWFISH=m
827CONFIG_CRYPTO_TWOFISH=m 839CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 2a05981cf5a0..704e42344cba 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:28:15 2005 4# Tue Apr 5 14:06:40 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29CONFIG_AUDIT=y 30CONFIG_AUDIT=y
30CONFIG_LOG_BUF_SHIFT=16
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
@@ -35,15 +35,16 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y 39CONFIG_FUTEX=y
39CONFIG_EPOLL=y 40CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y 41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
47 48
48# 49#
49# Loadable module support 50# Loadable module support
@@ -201,6 +202,8 @@ CONFIG_DM_CRYPT=m
201CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
202CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
203CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
204 207
205# 208#
206# Fusion MPT device support 209# Fusion MPT device support
@@ -224,7 +227,6 @@ CONFIG_NET=y
224# 227#
225CONFIG_PACKET=y 228CONFIG_PACKET=y
226# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
227CONFIG_NETLINK_DEV=y
228CONFIG_UNIX=y 230CONFIG_UNIX=y
229CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
230CONFIG_INET=y 232CONFIG_INET=y
@@ -327,7 +329,7 @@ CONFIG_IP_NF_ARPFILTER=m
327CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
328 330
329# 331#
330# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
331# 333#
332CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
333CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -399,7 +401,6 @@ CONFIG_DUMMY=m
399# CONFIG_BONDING is not set 401# CONFIG_BONDING is not set
400CONFIG_EQUALIZER=m 402CONFIG_EQUALIZER=m
401# CONFIG_TUN is not set 403# CONFIG_TUN is not set
402# CONFIG_ETHERTAP is not set
403 404
404# 405#
405# Ethernet (10 or 100Mbit) 406# Ethernet (10 or 100Mbit)
@@ -472,17 +473,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
472# CONFIG_INPUT_EVBUG is not set 473# CONFIG_INPUT_EVBUG is not set
473 474
474# 475#
475# Input I/O drivers
476#
477# CONFIG_GAMEPORT is not set
478CONFIG_SOUND_GAMEPORT=y
479CONFIG_SERIO=y
480CONFIG_SERIO_SERPORT=m
481# CONFIG_SERIO_CT82C710 is not set
482CONFIG_SERIO_LIBPS2=m
483# CONFIG_SERIO_RAW is not set
484
485#
486# Input Device Drivers 476# Input Device Drivers
487# 477#
488CONFIG_INPUT_KEYBOARD=y 478CONFIG_INPUT_KEYBOARD=y
@@ -500,6 +490,16 @@ CONFIG_MOUSE_SERIAL=m
500# CONFIG_INPUT_MISC is not set 490# CONFIG_INPUT_MISC is not set
501 491
502# 492#
493# Hardware I/O ports
494#
495CONFIG_SERIO=y
496CONFIG_SERIO_SERPORT=m
497CONFIG_SERIO_LIBPS2=m
498# CONFIG_SERIO_RAW is not set
499# CONFIG_GAMEPORT is not set
500CONFIG_SOUND_GAMEPORT=y
501
502#
503# Character devices 503# Character devices
504# 504#
505CONFIG_VT=y 505CONFIG_VT=y
@@ -540,6 +540,10 @@ CONFIG_GEN_RTC_X=y
540# CONFIG_RAW_DRIVER is not set 540# CONFIG_RAW_DRIVER is not set
541 541
542# 542#
543# TPM devices
544#
545
546#
543# I2C support 547# I2C support
544# 548#
545# CONFIG_I2C is not set 549# CONFIG_I2C is not set
@@ -567,8 +571,14 @@ CONFIG_GEN_RTC_X=y
567# Graphics support 571# Graphics support
568# 572#
569CONFIG_FB=y 573CONFIG_FB=y
574# CONFIG_FB_CFB_FILLRECT is not set
575# CONFIG_FB_CFB_COPYAREA is not set
576# CONFIG_FB_CFB_IMAGEBLIT is not set
577# CONFIG_FB_SOFT_CURSOR is not set
578# CONFIG_FB_MACMODES is not set
570CONFIG_FB_MODE_HELPERS=y 579CONFIG_FB_MODE_HELPERS=y
571# CONFIG_FB_TILEBLITTING is not set 580# CONFIG_FB_TILEBLITTING is not set
581# CONFIG_FB_S1D13XXX is not set
572# CONFIG_FB_VIRTUAL is not set 582# CONFIG_FB_VIRTUAL is not set
573 583
574# 584#
@@ -601,10 +611,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
601# CONFIG_USB_ARCH_HAS_OHCI is not set 611# CONFIG_USB_ARCH_HAS_OHCI is not set
602 612
603# 613#
604# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
605#
606
607#
608# USB Gadget Support 614# USB Gadget Support
609# 615#
610# CONFIG_USB_GADGET is not set 616# CONFIG_USB_GADGET is not set
@@ -805,14 +811,19 @@ CONFIG_NLS_UTF8=m
805# 811#
806# Kernel hacking 812# Kernel hacking
807# 813#
814# CONFIG_PRINTK_TIME is not set
808CONFIG_DEBUG_KERNEL=y 815CONFIG_DEBUG_KERNEL=y
809CONFIG_MAGIC_SYSRQ=y 816CONFIG_MAGIC_SYSRQ=y
817CONFIG_LOG_BUF_SHIFT=16
810# CONFIG_SCHEDSTATS is not set 818# CONFIG_SCHEDSTATS is not set
811# CONFIG_DEBUG_SLAB is not set 819# CONFIG_DEBUG_SLAB is not set
820# CONFIG_DEBUG_SPINLOCK is not set
821# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
812# CONFIG_DEBUG_KOBJECT is not set 822# CONFIG_DEBUG_KOBJECT is not set
813CONFIG_DEBUG_BUGVERBOSE=y 823CONFIG_DEBUG_BUGVERBOSE=y
814# CONFIG_DEBUG_INFO is not set 824# CONFIG_DEBUG_INFO is not set
815# CONFIG_DEBUG_FS is not set 825# CONFIG_DEBUG_FS is not set
826# CONFIG_FRAME_POINTER is not set
816 827
817# 828#
818# Security options 829# Security options
@@ -831,7 +842,8 @@ CONFIG_CRYPTO_MD5=y
831CONFIG_CRYPTO_SHA1=m 842CONFIG_CRYPTO_SHA1=m
832CONFIG_CRYPTO_SHA256=m 843CONFIG_CRYPTO_SHA256=m
833CONFIG_CRYPTO_SHA512=m 844CONFIG_CRYPTO_SHA512=m
834# CONFIG_CRYPTO_WP512 is not set 845CONFIG_CRYPTO_WP512=m
846CONFIG_CRYPTO_TGR192=m
835CONFIG_CRYPTO_DES=y 847CONFIG_CRYPTO_DES=y
836CONFIG_CRYPTO_BLOWFISH=m 848CONFIG_CRYPTO_BLOWFISH=m
837CONFIG_CRYPTO_TWOFISH=m 849CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig
index 2f09daca103f..5b2296ecba82 100644
--- a/arch/m68k/defconfig
+++ b/arch/m68k/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.11-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Wed Mar 2 15:27:58 2005 4# Tue Apr 5 14:05:31 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,6 +15,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -26,22 +27,22 @@ CONFIG_SYSVIPC=y
26# CONFIG_BSD_PROCESS_ACCT is not set 27# CONFIG_BSD_PROCESS_ACCT is not set
27CONFIG_SYSCTL=y 28CONFIG_SYSCTL=y
28# CONFIG_AUDIT is not set 29# CONFIG_AUDIT is not set
29CONFIG_LOG_BUF_SHIFT=14
30# CONFIG_HOTPLUG is not set 30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 31CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 32# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 33# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 34CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_EXTRA_PASS is not set 35# CONFIG_KALLSYMS_EXTRA_PASS is not set
36CONFIG_BASE_FULL=y
36CONFIG_FUTEX=y 37CONFIG_FUTEX=y
37CONFIG_EPOLL=y 38CONFIG_EPOLL=y
38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39CONFIG_SHMEM=y 39CONFIG_SHMEM=y
40CONFIG_CC_ALIGN_FUNCTIONS=0 40CONFIG_CC_ALIGN_FUNCTIONS=0
41CONFIG_CC_ALIGN_LABELS=0 41CONFIG_CC_ALIGN_LABELS=0
42CONFIG_CC_ALIGN_LOOPS=0 42CONFIG_CC_ALIGN_LOOPS=0
43CONFIG_CC_ALIGN_JUMPS=0 43CONFIG_CC_ALIGN_JUMPS=0
44# CONFIG_TINY_SHMEM is not set 44# CONFIG_TINY_SHMEM is not set
45CONFIG_BASE_SMALL=0
45 46
46# 47#
47# Loadable module support 48# Loadable module support
@@ -212,7 +213,6 @@ CONFIG_NET=y
212# 213#
213CONFIG_PACKET=y 214CONFIG_PACKET=y
214# CONFIG_PACKET_MMAP is not set 215# CONFIG_PACKET_MMAP is not set
215# CONFIG_NETLINK_DEV is not set
216CONFIG_UNIX=y 216CONFIG_UNIX=y
217# CONFIG_NET_KEY is not set 217# CONFIG_NET_KEY is not set
218CONFIG_INET=y 218CONFIG_INET=y
@@ -329,17 +329,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
329# CONFIG_INPUT_EVBUG is not set 329# CONFIG_INPUT_EVBUG is not set
330 330
331# 331#
332# Input I/O drivers
333#
334# CONFIG_GAMEPORT is not set
335CONFIG_SOUND_GAMEPORT=y
336CONFIG_SERIO=y
337CONFIG_SERIO_SERPORT=y
338# CONFIG_SERIO_CT82C710 is not set
339CONFIG_SERIO_LIBPS2=y
340# CONFIG_SERIO_RAW is not set
341
342#
343# Input Device Drivers 332# Input Device Drivers
344# 333#
345CONFIG_INPUT_KEYBOARD=y 334CONFIG_INPUT_KEYBOARD=y
@@ -359,6 +348,16 @@ CONFIG_MOUSE_PS2=y
359# CONFIG_INPUT_MISC is not set 348# CONFIG_INPUT_MISC is not set
360 349
361# 350#
351# Hardware I/O ports
352#
353CONFIG_SERIO=y
354CONFIG_SERIO_SERPORT=y
355CONFIG_SERIO_LIBPS2=y
356# CONFIG_SERIO_RAW is not set
357# CONFIG_GAMEPORT is not set
358CONFIG_SOUND_GAMEPORT=y
359
360#
362# Character devices 361# Character devices
363# 362#
364CONFIG_VT=y 363CONFIG_VT=y
@@ -399,6 +398,10 @@ CONFIG_LEGACY_PTY_COUNT=256
399# CONFIG_RAW_DRIVER is not set 398# CONFIG_RAW_DRIVER is not set
400 399
401# 400#
401# TPM devices
402#
403
404#
402# I2C support 405# I2C support
403# 406#
404# CONFIG_I2C is not set 407# CONFIG_I2C is not set
@@ -426,6 +429,11 @@ CONFIG_LEGACY_PTY_COUNT=256
426# Graphics support 429# Graphics support
427# 430#
428CONFIG_FB=y 431CONFIG_FB=y
432# CONFIG_FB_CFB_FILLRECT is not set
433# CONFIG_FB_CFB_COPYAREA is not set
434# CONFIG_FB_CFB_IMAGEBLIT is not set
435CONFIG_FB_SOFT_CURSOR=y
436# CONFIG_FB_MACMODES is not set
429CONFIG_FB_MODE_HELPERS=y 437CONFIG_FB_MODE_HELPERS=y
430# CONFIG_FB_TILEBLITTING is not set 438# CONFIG_FB_TILEBLITTING is not set
431# CONFIG_FB_CIRRUS is not set 439# CONFIG_FB_CIRRUS is not set
@@ -434,6 +442,7 @@ CONFIG_FB_AMIGA_OCS=y
434CONFIG_FB_AMIGA_ECS=y 442CONFIG_FB_AMIGA_ECS=y
435CONFIG_FB_AMIGA_AGA=y 443CONFIG_FB_AMIGA_AGA=y
436# CONFIG_FB_FM2 is not set 444# CONFIG_FB_FM2 is not set
445# CONFIG_FB_S1D13XXX is not set
437# CONFIG_FB_VIRTUAL is not set 446# CONFIG_FB_VIRTUAL is not set
438 447
439# 448#
@@ -460,10 +469,6 @@ CONFIG_DUMMY_CONSOLE=y
460# CONFIG_USB_ARCH_HAS_OHCI is not set 469# CONFIG_USB_ARCH_HAS_OHCI is not set
461 470
462# 471#
463# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
464#
465
466#
467# USB Gadget Support 472# USB Gadget Support
468# 473#
469# CONFIG_USB_GADGET is not set 474# CONFIG_USB_GADGET is not set
@@ -623,7 +628,9 @@ CONFIG_NLS_CODEPAGE_437=y
623# 628#
624# Kernel hacking 629# Kernel hacking
625# 630#
631# CONFIG_PRINTK_TIME is not set
626# CONFIG_DEBUG_KERNEL is not set 632# CONFIG_DEBUG_KERNEL is not set
633CONFIG_LOG_BUF_SHIFT=14
627CONFIG_DEBUG_BUGVERBOSE=y 634CONFIG_DEBUG_BUGVERBOSE=y
628 635
629# 636#
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-21 03:32:17 -0400