diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /arch/s390/Kconfig | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
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 dcb667c4375a..2eca5fe0e75b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -82,6 +82,7 @@ config S390 | |||
| 82 | select USE_GENERIC_SMP_HELPERS if SMP | 82 | select USE_GENERIC_SMP_HELPERS if SMP |
| 83 | select HAVE_SYSCALL_WRAPPERS | 83 | select HAVE_SYSCALL_WRAPPERS |
| 84 | select HAVE_FUNCTION_TRACER | 84 | select HAVE_FUNCTION_TRACER |
| 85 | select HAVE_DEFAULT_NO_SPIN_MUTEXES | ||
| 85 | select HAVE_OPROFILE | 86 | select HAVE_OPROFILE |
| 86 | select HAVE_KPROBES | 87 | select HAVE_KPROBES |
| 87 | select HAVE_KRETPROBES | 88 | select HAVE_KRETPROBES |