aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/mac_defconfig
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/m68k/configs/mac_defconfig
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/m68k/configs/mac_defconfig')
-rw-r--r--arch/m68k/configs/mac_defconfig60
1 files changed, 36 insertions, 24 deletions
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