Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26b08333 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc/tracehook' of... 

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"
parents a17e1879 15cbf627

arch/parisc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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,