diff --git a/[refs] b/[refs]
index b0a8a9e33099..2942d4d7cf17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2225a122ae26d542bdce523d9d87a4a7ba10e07b
+refs/heads/master: 5e6dbc260704ce4d22fc9664f517f0bb6748feaa
diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig
index 524d9352f17e..f388dc68f605 100644
--- a/trunk/arch/parisc/Kconfig
+++ b/trunk/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,