Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[S390] Update default configuration.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Martin Schwidefsky and committed by
Martin Schwidefsky
40a510dd 9940fa80

+13 -10
+13 -10
arch/s390/defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.34-rc3 4 - # Fri Apr 9 09:57:10 2010 3 + # Linux kernel version: 2.6.35-rc1 4 + # Fri Jun 4 11:32:40 2010 5 5 # 6 6 CONFIG_SCHED_MC=y 7 7 CONFIG_MMU=y ··· 35 35 CONFIG_EXPERIMENTAL=y 36 36 CONFIG_LOCK_KERNEL=y 37 37 CONFIG_INIT_ENV_ARG_LIMIT=32 38 + CONFIG_CROSS_COMPILE="" 38 39 CONFIG_LOCALVERSION="" 39 40 CONFIG_LOCALVERSION_AUTO=y 40 41 CONFIG_HAVE_KERNEL_GZIP=y 41 42 CONFIG_HAVE_KERNEL_BZIP2=y 42 43 CONFIG_HAVE_KERNEL_LZMA=y 44 + CONFIG_HAVE_KERNEL_LZO=y 43 45 CONFIG_KERNEL_GZIP=y 44 46 # CONFIG_KERNEL_BZIP2 is not set 45 47 # CONFIG_KERNEL_LZMA is not set ··· 79 77 # CONFIG_CGROUP_CPUACCT is not set 80 78 # CONFIG_RESOURCE_COUNTERS is not set 81 79 # CONFIG_CGROUP_SCHED is not set 80 + # CONFIG_BLK_CGROUP is not set 82 81 CONFIG_SYSFS_DEPRECATED=y 83 82 CONFIG_SYSFS_DEPRECATED_V2=y 84 83 # CONFIG_RELAY is not set ··· 160 157 CONFIG_BLOCK=y 161 158 CONFIG_BLK_DEV_BSG=y 162 159 # CONFIG_BLK_DEV_INTEGRITY is not set 163 - # CONFIG_BLK_CGROUP is not set 164 160 CONFIG_BLOCK_COMPAT=y 165 161 166 162 # ··· 168 166 CONFIG_IOSCHED_NOOP=y 169 167 CONFIG_IOSCHED_DEADLINE=y 170 168 CONFIG_IOSCHED_CFQ=y 171 - # CONFIG_CFQ_GROUP_IOSCHED is not set 172 169 CONFIG_DEFAULT_DEADLINE=y 173 170 # CONFIG_DEFAULT_CFQ is not set 174 171 # CONFIG_DEFAULT_NOOP is not set ··· 248 247 CONFIG_SMP=y 249 248 CONFIG_NR_CPUS=32 250 249 CONFIG_HOTPLUG_CPU=y 251 - # CONFIG_SCHED_BOOK is not set 252 250 CONFIG_COMPAT=y 253 251 CONFIG_SYSVIPC_COMPAT=y 254 252 CONFIG_AUDIT_ARCH=y ··· 320 320 # CONFIG_HAVE_AOUT is not set 321 321 CONFIG_BINFMT_MISC=m 322 322 CONFIG_FORCE_MAX_ZONEORDER=9 323 - # CONFIG_PROCESS_DEBUG is not set 324 323 CONFIG_PFAULT=y 325 324 # CONFIG_SHARED_KERNEL is not set 326 325 # CONFIG_CMM is not set ··· 456 457 # CONFIG_IP6_NF_IPTABLES is not set 457 458 # CONFIG_IP_DCCP is not set 458 459 CONFIG_IP_SCTP=m 460 + # CONFIG_NET_SCTPPROBE is not set 459 461 # CONFIG_SCTP_DBG_MSG is not set 460 462 # CONFIG_SCTP_DBG_OBJCNT is not set 461 463 # CONFIG_SCTP_HMAC_NONE is not set ··· 465 465 # CONFIG_RDS is not set 466 466 # CONFIG_TIPC is not set 467 467 # CONFIG_ATM is not set 468 + # CONFIG_L2TP is not set 468 469 # CONFIG_BRIDGE is not set 469 470 # CONFIG_VLAN_8021Q is not set 470 471 # CONFIG_DECNET is not set ··· 526 525 # CONFIG_NET_CLS_IND is not set 527 526 CONFIG_NET_SCH_FIFO=y 528 527 # CONFIG_DCB is not set 528 + CONFIG_RPS=y 529 529 530 530 # 531 531 # Network testing ··· 548 546 # CONFIG_WIMAX is not set 549 547 # CONFIG_RFKILL is not set 550 548 # CONFIG_NET_9P is not set 549 + # CONFIG_CAIF is not set 551 550 # CONFIG_PCMCIA is not set 552 551 CONFIG_CCW=y 553 552 ··· 731 728 # Character devices 732 729 # 733 730 CONFIG_DEVKMEM=y 731 + # CONFIG_N_GSM is not set 734 732 CONFIG_UNIX98_PTYS=y 735 733 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 736 734 CONFIG_LEGACY_PTYS=y ··· 779 775 # CONFIG_MONREADER is not set 780 776 CONFIG_MONWRITER=m 781 777 CONFIG_S390_VMUR=m 778 + # CONFIG_RAMOOPS is not set 782 779 783 780 # 784 781 # PPS support ··· 793 788 # CONFIG_NEW_LEDS is not set 794 789 CONFIG_ACCESSIBILITY=y 795 790 # CONFIG_AUXDISPLAY is not set 796 - 797 - # 798 - # TI VLYNQ 799 - # 800 791 # CONFIG_STAGING is not set 801 792 802 793 # ··· 977 976 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 978 977 CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 979 978 # CONFIG_LKDTM is not set 979 + # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set 980 980 # CONFIG_FAULT_INJECTION is not set 981 981 # CONFIG_LATENCYTOP is not set 982 982 CONFIG_SYSCTL_SYSCALL_CHECK=y ··· 1012 1010 CONFIG_KPROBE_EVENT=y 1013 1011 # CONFIG_RING_BUFFER_BENCHMARK is not set 1014 1012 # CONFIG_DYNAMIC_DEBUG is not set 1013 + # CONFIG_ATOMIC64_SELFTEST is not set 1015 1014 CONFIG_SAMPLES=y 1016 1015 # CONFIG_SAMPLE_TRACEPOINTS is not set 1017 1016 # CONFIG_SAMPLE_TRACE_EVENTS is not set