Skip to content

Commit

Permalink
Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history 
…/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"
  • Loading branch information
Linus Torvalds committed Feb 23, 2010
2 parents a17e187 + 15cbf62 commit 26b0833
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/parisc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 26b0833

Please sign in to comment.