diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-20 03:23:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-20 03:23:28 -0500 |
| commit | 0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch) | |
| tree | 75aa590c636feed7d110c03eddb56cc518fc034c /arch/s390/Kconfig | |
| parent | 0a2a18b721abc960fbcada406746877d22340a60 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index a94a3c3ae932..6b0a3538dc63 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -77,6 +77,7 @@ mainmenu "Linux Kernel Configuration" | |||
| 77 | config S390 | 77 | config S390 |
| 78 | def_bool y | 78 | def_bool y |
| 79 | select USE_GENERIC_SMP_HELPERS if SMP | 79 | select USE_GENERIC_SMP_HELPERS if SMP |
| 80 | select HAVE_SYSCALL_WRAPPERS | ||
| 80 | select HAVE_FUNCTION_TRACER | 81 | select HAVE_FUNCTION_TRACER |
| 81 | select HAVE_OPROFILE | 82 | select HAVE_OPROFILE |
| 82 | select HAVE_KPROBES | 83 | select HAVE_KPROBES |