diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
| commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
| tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /arch/powerpc/Kconfig | |
| parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
| parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 5b1527883fc..525c13a4de9 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -108,8 +108,7 @@ config ARCH_NO_VIRT_TO_BUS config PPC bool default y - select HAVE_DYNAMIC_FTRACE - select HAVE_FTRACE + select HAVE_FUNCTION_TRACER select ARCH_WANT_OPTIONAL_GPIOLIB select HAVE_IDE select HAVE_IOREMAP_PROT |