aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2007-07-17 07:36:02 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-07-17 07:36:18 -0400
commita13a9b6d983e0301692e16a169865e1feb8338c0 (patch)
treeeb66aae5eb8c1ff86ea8ad6fe96873fec3ec552c /arch/s390
parenta5fcaa210626a79465321e344c91a6a7dc3881fa (diff)
[S390] Update default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/defconfig109
1 files changed, 31 insertions, 78 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 485b60c1983c..d518693b5890 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/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.21 3# Linux kernel version: 2.6.22
4# Thu May 10 15:18:19 2007 4# Tue Jul 17 12:50:23 2007
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_ZONE_DMA=y 7CONFIG_ZONE_DMA=y
@@ -32,12 +32,11 @@ CONFIG_LOCALVERSION=""
32CONFIG_LOCALVERSION_AUTO=y 32CONFIG_LOCALVERSION_AUTO=y
33CONFIG_SWAP=y 33CONFIG_SWAP=y
34CONFIG_SYSVIPC=y 34CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set
36CONFIG_SYSVIPC_SYSCTL=y 35CONFIG_SYSVIPC_SYSCTL=y
37CONFIG_POSIX_MQUEUE=y 36CONFIG_POSIX_MQUEUE=y
38# CONFIG_BSD_PROCESS_ACCT is not set 37# CONFIG_BSD_PROCESS_ACCT is not set
39# CONFIG_TASKSTATS is not set 38# CONFIG_TASKSTATS is not set
40# CONFIG_UTS_NS is not set 39# CONFIG_USER_NS is not set
41CONFIG_AUDIT=y 40CONFIG_AUDIT=y
42# CONFIG_AUDITSYSCALL is not set 41# CONFIG_AUDITSYSCALL is not set
43CONFIG_IKCONFIG=y 42CONFIG_IKCONFIG=y
@@ -61,20 +60,19 @@ CONFIG_BUG=y
61CONFIG_ELF_CORE=y 60CONFIG_ELF_CORE=y
62CONFIG_BASE_FULL=y 61CONFIG_BASE_FULL=y
63CONFIG_FUTEX=y 62CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 64CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y
67CONFIG_EVENTFD=y
65CONFIG_SHMEM=y 68CONFIG_SHMEM=y
66CONFIG_VM_EVENT_COUNTERS=y 69CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLUB_DEBUG=y
68CONFIG_SLAB=y 70CONFIG_SLAB=y
69# CONFIG_SLUB is not set 71# CONFIG_SLUB is not set
70# CONFIG_SLOB is not set 72# CONFIG_SLOB is not set
71CONFIG_RT_MUTEXES=y 73CONFIG_RT_MUTEXES=y
72# CONFIG_TINY_SHMEM is not set 74# CONFIG_TINY_SHMEM is not set
73CONFIG_BASE_SMALL=0 75CONFIG_BASE_SMALL=0
74
75#
76# Loadable module support
77#
78CONFIG_MODULES=y 76CONFIG_MODULES=y
79CONFIG_MODULE_UNLOAD=y 77CONFIG_MODULE_UNLOAD=y
80# CONFIG_MODULE_FORCE_UNLOAD is not set 78# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -82,12 +80,9 @@ CONFIG_MODVERSIONS=y
82# CONFIG_MODULE_SRCVERSION_ALL is not set 80# CONFIG_MODULE_SRCVERSION_ALL is not set
83CONFIG_KMOD=y 81CONFIG_KMOD=y
84CONFIG_STOP_MACHINE=y 82CONFIG_STOP_MACHINE=y
85
86#
87# Block layer
88#
89CONFIG_BLOCK=y 83CONFIG_BLOCK=y
90# CONFIG_BLK_DEV_IO_TRACE is not set 84# CONFIG_BLK_DEV_IO_TRACE is not set
85CONFIG_BLK_DEV_BSG=y
91 86
92# 87#
93# IO Schedulers 88# IO Schedulers
@@ -151,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
151CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
152CONFIG_RESOURCES_64BIT=y 147CONFIG_RESOURCES_64BIT=y
153CONFIG_ZONE_DMA_FLAG=1 148CONFIG_ZONE_DMA_FLAG=1
149CONFIG_VIRT_TO_BUS=y
154CONFIG_HOLES_IN_ZONE=y 150CONFIG_HOLES_IN_ZONE=y
155 151
156# 152#
@@ -248,25 +244,13 @@ CONFIG_IPV6_SIT=y
248# CONFIG_IPV6_MULTIPLE_TABLES is not set 244# CONFIG_IPV6_MULTIPLE_TABLES is not set
249# CONFIG_NETWORK_SECMARK is not set 245# CONFIG_NETWORK_SECMARK is not set
250# CONFIG_NETFILTER is not set 246# CONFIG_NETFILTER is not set
251
252#
253# DCCP Configuration (EXPERIMENTAL)
254#
255# CONFIG_IP_DCCP is not set 247# CONFIG_IP_DCCP is not set
256
257#
258# SCTP Configuration (EXPERIMENTAL)
259#
260CONFIG_IP_SCTP=m 248CONFIG_IP_SCTP=m
261# CONFIG_SCTP_DBG_MSG is not set 249# CONFIG_SCTP_DBG_MSG is not set
262# CONFIG_SCTP_DBG_OBJCNT is not set 250# CONFIG_SCTP_DBG_OBJCNT is not set
263# CONFIG_SCTP_HMAC_NONE is not set 251# CONFIG_SCTP_HMAC_NONE is not set
264# CONFIG_SCTP_HMAC_SHA1 is not set 252# CONFIG_SCTP_HMAC_SHA1 is not set
265CONFIG_SCTP_HMAC_MD5=y 253CONFIG_SCTP_HMAC_MD5=y
266
267#
268# TIPC Configuration (EXPERIMENTAL)
269#
270# CONFIG_TIPC is not set 254# CONFIG_TIPC is not set
271# CONFIG_ATM is not set 255# CONFIG_ATM is not set
272# CONFIG_BRIDGE is not set 256# CONFIG_BRIDGE is not set
@@ -293,6 +277,7 @@ CONFIG_NET_SCH_CBQ=m
293# CONFIG_NET_SCH_HTB is not set 277# CONFIG_NET_SCH_HTB is not set
294# CONFIG_NET_SCH_HFSC is not set 278# CONFIG_NET_SCH_HFSC is not set
295CONFIG_NET_SCH_PRIO=m 279CONFIG_NET_SCH_PRIO=m
280CONFIG_NET_SCH_RR=m
296CONFIG_NET_SCH_RED=m 281CONFIG_NET_SCH_RED=m
297CONFIG_NET_SCH_SFQ=m 282CONFIG_NET_SCH_SFQ=m
298CONFIG_NET_SCH_TEQL=m 283CONFIG_NET_SCH_TEQL=m
@@ -317,10 +302,14 @@ CONFIG_CLS_U32_MARK=y
317CONFIG_NET_CLS_RSVP=m 302CONFIG_NET_CLS_RSVP=m
318CONFIG_NET_CLS_RSVP6=m 303CONFIG_NET_CLS_RSVP6=m
319# CONFIG_NET_EMATCH is not set 304# CONFIG_NET_EMATCH is not set
320# CONFIG_NET_CLS_ACT is not set 305CONFIG_NET_CLS_ACT=y
306CONFIG_NET_ACT_POLICE=y
307# CONFIG_NET_ACT_GACT is not set
308# CONFIG_NET_ACT_MIRRED is not set
309# CONFIG_NET_ACT_PEDIT is not set
310# CONFIG_NET_ACT_SIMP is not set
321CONFIG_NET_CLS_POLICE=y 311CONFIG_NET_CLS_POLICE=y
322# CONFIG_NET_CLS_IND is not set 312# CONFIG_NET_CLS_IND is not set
323CONFIG_NET_ESTIMATOR=y
324 313
325# 314#
326# Network testing 315# Network testing
@@ -329,6 +318,7 @@ CONFIG_NET_ESTIMATOR=y
329# CONFIG_NET_TCPPROBE is not set 318# CONFIG_NET_TCPPROBE is not set
330# CONFIG_AF_RXRPC is not set 319# CONFIG_AF_RXRPC is not set
331# CONFIG_RFKILL is not set 320# CONFIG_RFKILL is not set
321# CONFIG_NET_9P is not set
332# CONFIG_PCMCIA is not set 322# CONFIG_PCMCIA is not set
333CONFIG_CCW=y 323CONFIG_CCW=y
334 324
@@ -345,15 +335,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
345# CONFIG_DEBUG_DRIVER is not set 335# CONFIG_DEBUG_DRIVER is not set
346# CONFIG_DEBUG_DEVRES is not set 336# CONFIG_DEBUG_DEVRES is not set
347CONFIG_SYS_HYPERVISOR=y 337CONFIG_SYS_HYPERVISOR=y
348
349#
350# Connector - unified userspace <-> kernelspace linker
351#
352# CONFIG_CONNECTOR is not set 338# CONFIG_CONNECTOR is not set
353 339CONFIG_BLK_DEV=y
354#
355# Block devices
356#
357# CONFIG_BLK_DEV_COW_COMMON is not set 340# CONFIG_BLK_DEV_COW_COMMON is not set
358CONFIG_BLK_DEV_LOOP=m 341CONFIG_BLK_DEV_LOOP=m
359# CONFIG_BLK_DEV_CRYPTOLOOP is not set 342# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -376,17 +359,15 @@ CONFIG_DASD_ECKD=y
376CONFIG_DASD_FBA=y 359CONFIG_DASD_FBA=y
377CONFIG_DASD_DIAG=y 360CONFIG_DASD_DIAG=y
378CONFIG_DASD_EER=y 361CONFIG_DASD_EER=y
379 362CONFIG_MISC_DEVICES=y
380# 363# CONFIG_EEPROM_93CX6 is not set
381# Misc devices
382#
383# CONFIG_BLINK is not set
384 364
385# 365#
386# SCSI device support 366# SCSI device support
387# 367#
388# CONFIG_RAID_ATTRS is not set 368# CONFIG_RAID_ATTRS is not set
389CONFIG_SCSI=y 369CONFIG_SCSI=y
370# CONFIG_SCSI_DMA is not set
390# CONFIG_SCSI_TGT is not set 371# CONFIG_SCSI_TGT is not set
391CONFIG_SCSI_NETLINK=y 372CONFIG_SCSI_NETLINK=y
392CONFIG_SCSI_PROC_FS=y 373CONFIG_SCSI_PROC_FS=y
@@ -447,40 +428,21 @@ CONFIG_DM_MIRROR=y
447CONFIG_DM_ZERO=y 428CONFIG_DM_ZERO=y
448CONFIG_DM_MULTIPATH=y 429CONFIG_DM_MULTIPATH=y
449# CONFIG_DM_MULTIPATH_EMC is not set 430# CONFIG_DM_MULTIPATH_EMC is not set
431# CONFIG_DM_MULTIPATH_RDAC is not set
450# CONFIG_DM_DELAY is not set 432# CONFIG_DM_DELAY is not set
451
452#
453# Network device support
454#
455CONFIG_NETDEVICES=y 433CONFIG_NETDEVICES=y
434# CONFIG_NETDEVICES_MULTIQUEUE is not set
435# CONFIG_IFB is not set
456CONFIG_DUMMY=m 436CONFIG_DUMMY=m
457CONFIG_BONDING=m 437CONFIG_BONDING=m
438# CONFIG_MACVLAN is not set
458CONFIG_EQUALIZER=m 439CONFIG_EQUALIZER=m
459CONFIG_TUN=m 440CONFIG_TUN=m
460
461#
462# Ethernet (10 or 100Mbit)
463#
464CONFIG_NET_ETHERNET=y 441CONFIG_NET_ETHERNET=y
465# CONFIG_MII is not set 442# CONFIG_MII is not set
466 443CONFIG_NETDEV_1000=y
467# 444CONFIG_NETDEV_10000=y
468# Ethernet (1000 Mbit)
469#
470
471#
472# Ethernet (10000 Mbit)
473#
474CONFIG_MLX4_DEBUG=y
475
476#
477# Token Ring devices
478#
479# CONFIG_TR is not set 445# CONFIG_TR is not set
480
481#
482# Wan interfaces
483#
484# CONFIG_WAN is not set 446# CONFIG_WAN is not set
485 447
486# 448#
@@ -511,10 +473,6 @@ CONFIG_CCWGROUP=y
511CONFIG_UNIX98_PTYS=y 473CONFIG_UNIX98_PTYS=y
512CONFIG_LEGACY_PTYS=y 474CONFIG_LEGACY_PTYS=y
513CONFIG_LEGACY_PTY_COUNT=256 475CONFIG_LEGACY_PTY_COUNT=256
514
515#
516# Watchdog Cards
517#
518# CONFIG_WATCHDOG is not set 476# CONFIG_WATCHDOG is not set
519CONFIG_HW_RANDOM=m 477CONFIG_HW_RANDOM=m
520# CONFIG_R3964 is not set 478# CONFIG_R3964 is not set
@@ -554,6 +512,7 @@ CONFIG_S390_TAPE_34XX=m
554# CONFIG_VMCP is not set 512# CONFIG_VMCP is not set
555# CONFIG_MONREADER is not set 513# CONFIG_MONREADER is not set
556CONFIG_MONWRITER=m 514CONFIG_MONWRITER=m
515# CONFIG_POWER_SUPPLY is not set
557 516
558# 517#
559# File systems 518# File systems
@@ -655,7 +614,6 @@ CONFIG_SUNRPC=y
655# CONFIG_NCP_FS is not set 614# CONFIG_NCP_FS is not set
656# CONFIG_CODA_FS is not set 615# CONFIG_CODA_FS is not set
657# CONFIG_AFS_FS is not set 616# CONFIG_AFS_FS is not set
658# CONFIG_9P_FS is not set
659 617
660# 618#
661# Partition Types 619# Partition Types
@@ -712,6 +670,7 @@ CONFIG_MAGIC_SYSRQ=y
712CONFIG_DEBUG_FS=y 670CONFIG_DEBUG_FS=y
713CONFIG_HEADERS_CHECK=y 671CONFIG_HEADERS_CHECK=y
714CONFIG_DEBUG_KERNEL=y 672CONFIG_DEBUG_KERNEL=y
673# CONFIG_SCHED_DEBUG is not set
715# CONFIG_SCHEDSTATS is not set 674# CONFIG_SCHEDSTATS is not set
716# CONFIG_TIMER_STATS is not set 675# CONFIG_TIMER_STATS is not set
717# CONFIG_DEBUG_SLAB is not set 676# CONFIG_DEBUG_SLAB is not set
@@ -740,10 +699,6 @@ CONFIG_FORCED_INLINING=y
740# 699#
741# CONFIG_KEYS is not set 700# CONFIG_KEYS is not set
742# CONFIG_SECURITY is not set 701# CONFIG_SECURITY is not set
743
744#
745# Cryptographic options
746#
747CONFIG_CRYPTO=y 702CONFIG_CRYPTO=y
748CONFIG_CRYPTO_ALGAPI=y 703CONFIG_CRYPTO_ALGAPI=y
749CONFIG_CRYPTO_BLKCIPHER=y 704CONFIG_CRYPTO_BLKCIPHER=y
@@ -782,10 +737,7 @@ CONFIG_CRYPTO_FCRYPT=m
782# CONFIG_CRYPTO_CRC32C is not set 737# CONFIG_CRYPTO_CRC32C is not set
783CONFIG_CRYPTO_CAMELLIA=m 738CONFIG_CRYPTO_CAMELLIA=m
784# CONFIG_CRYPTO_TEST is not set 739# CONFIG_CRYPTO_TEST is not set
785 740CONFIG_CRYPTO_HW=y
786#
787# Hardware crypto devices
788#
789# CONFIG_CRYPTO_SHA1_S390 is not set 741# CONFIG_CRYPTO_SHA1_S390 is not set
790# CONFIG_CRYPTO_SHA256_S390 is not set 742# CONFIG_CRYPTO_SHA256_S390 is not set
791# CONFIG_CRYPTO_DES_S390 is not set 743# CONFIG_CRYPTO_DES_S390 is not set
@@ -800,6 +752,7 @@ CONFIG_ZCRYPT=m
800CONFIG_BITREVERSE=m 752CONFIG_BITREVERSE=m
801# CONFIG_CRC_CCITT is not set 753# CONFIG_CRC_CCITT is not set
802# CONFIG_CRC16 is not set 754# CONFIG_CRC16 is not set
755# CONFIG_CRC_ITU_T is not set
803CONFIG_CRC32=m 756CONFIG_CRC32=m
804# CONFIG_LIBCRC32C is not set 757# CONFIG_LIBCRC32C is not set
805CONFIG_PLIST=y 758CONFIG_PLIST=y