diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 22:51:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 22:51:13 -0500 |
| commit | 26b0833366c2521b890dfa8cb0e922be7debed37 (patch) | |
| tree | 73e0e1302be5af9a253401bff7bad3ec528ce380 | |
| parent | a17e18790a8c47113a73139d54a375dc9ccd8f08 (diff) | |
| parent | 15cbf627abcd93c3c668d5a92d58d9fec8f953dd (diff) | |
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/Kconfig | 1 |
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 | |||
| 18 | select BUG | 18 | select BUG |
| 19 | select HAVE_PERF_EVENTS | 19 | select HAVE_PERF_EVENTS |
| 20 | select GENERIC_ATOMIC64 if !64BIT | 20 | select GENERIC_ATOMIC64 if !64BIT |
| 21 | select HAVE_ARCH_TRACEHOOK | ||
| 22 | help | 21 | help |
| 23 | The PA-RISC microprocessor is designed by Hewlett-Packard and used | 22 | The PA-RISC microprocessor is designed by Hewlett-Packard and used |
| 24 | in many of their workstations & servers (HP9000 700 and 800 series, | 23 | in many of their workstations & servers (HP9000 700 and 800 series, |