summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-22 19:51:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-22 19:51:13 -0800
commit26b0833366c2521b890dfa8cb0e922be7debed37 (patch)
tree73e0e1302be5af9a253401bff7bad3ec528ce380
parenta17e18790a8c47113a73139d54a375dc9ccd8f08 (diff)
parent15cbf627abcd93c3c668d5a92d58d9fec8f953dd (diff)
downloadlinux-26b0833366c2521b890dfa8cb0e922be7debed37.tar.bz2
Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland
* 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland: Revert "parisc: HAVE_ARCH_TRACEHOOK"
-rw-r--r--arch/parisc/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 524d9352f17e..f388dc68f605 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -18,7 +18,6 @@ config PARISC
select BUG
select HAVE_PERF_EVENTS
select GENERIC_ATOMIC64 if !64BIT
- select HAVE_ARCH_TRACEHOOK
help
The PA-RISC microprocessor is designed by Hewlett-Packard and used
in many of their workstations & servers (HP9000 700 and 800 series,