diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-07-26 04:46:05 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-07-26 10:24:20 -0400 |
| commit | 216550e4fd5ade3f255bd5460db6b59e57f5f8c2 (patch) | |
| tree | 4291b1ceb4fff8e497d1c43bc6bfbeb2bbc291cc /arch | |
| parent | 0f6f281b731d20bfe75c13f85d33f3f05b440222 (diff) | |
s390: update defconfig
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 37d2bf267964..967923dea98d 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
| @@ -7,6 +7,9 @@ CONFIG_TASK_DELAY_ACCT=y | |||
| 7 | CONFIG_TASK_XACCT=y | 7 | CONFIG_TASK_XACCT=y |
| 8 | CONFIG_TASK_IO_ACCOUNTING=y | 8 | CONFIG_TASK_IO_ACCOUNTING=y |
| 9 | CONFIG_AUDIT=y | 9 | CONFIG_AUDIT=y |
| 10 | CONFIG_NO_HZ=y | ||
| 11 | CONFIG_HIGH_RES_TIMERS=y | ||
| 12 | CONFIG_RCU_FAST_NO_HZ=y | ||
| 10 | CONFIG_IKCONFIG=y | 13 | CONFIG_IKCONFIG=y |
| 11 | CONFIG_IKCONFIG_PROC=y | 14 | CONFIG_IKCONFIG_PROC=y |
| 12 | CONFIG_CGROUPS=y | 15 | CONFIG_CGROUPS=y |
| @@ -35,8 +38,6 @@ CONFIG_MODVERSIONS=y | |||
| 35 | CONFIG_PARTITION_ADVANCED=y | 38 | CONFIG_PARTITION_ADVANCED=y |
| 36 | CONFIG_IBM_PARTITION=y | 39 | CONFIG_IBM_PARTITION=y |
| 37 | CONFIG_DEFAULT_DEADLINE=y | 40 | CONFIG_DEFAULT_DEADLINE=y |
| 38 | CONFIG_NO_HZ=y | ||
| 39 | CONFIG_HIGH_RES_TIMERS=y | ||
| 40 | CONFIG_PREEMPT=y | 41 | CONFIG_PREEMPT=y |
| 41 | CONFIG_MEMORY_HOTPLUG=y | 42 | CONFIG_MEMORY_HOTPLUG=y |
| 42 | CONFIG_MEMORY_HOTREMOVE=y | 43 | CONFIG_MEMORY_HOTREMOVE=y |