diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/powerpc/Kconfig | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 9391199d9e77..441ce06174ff 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -112,7 +112,7 @@ config PPC | |||
| 112 | bool | 112 | bool |
| 113 | default y | 113 | default y |
| 114 | select HAVE_DYNAMIC_FTRACE | 114 | select HAVE_DYNAMIC_FTRACE |
| 115 | select HAVE_FTRACE | 115 | select HAVE_FUNCTION_TRACER |
| 116 | select ARCH_WANT_OPTIONAL_GPIOLIB | 116 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 117 | select HAVE_IDE | 117 | select HAVE_IDE |
| 118 | select HAVE_IOREMAP_PROT | 118 | select HAVE_IOREMAP_PROT |