diff options
| author | Benjamin Herrenschmidt | 2008-07-15 07:44:51 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2008-07-15 07:44:51 +0200 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /arch/powerpc/Kconfig | |
| parent | powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES (diff) | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | kernel-qcow2-linux-43d2548bb2ef7e6d753f91468a746784041e522d.tar.gz kernel-qcow2-linux-43d2548bb2ef7e6d753f91468a746784041e522d.tar.xz kernel-qcow2-linux-43d2548bb2ef7e6d753f91468a746784041e522d.zip | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 06b72771ae22..1530a41fc56d 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -108,12 +108,14 @@ config ARCH_NO_VIRT_TO_BUS config PPC bool default y + select HAVE_DYNAMIC_FTRACE + select HAVE_FTRACE select HAVE_IDE - select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_LMB select HAVE_DMA_ATTRS if PPC64 + select HAVE_OPROFILE config EARLY_PRINTK bool |