diff --git a/[refs] b/[refs]
index 344a4f4b1367..8abf2b85d677 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e4e980b027c892b02a73d6ea0d01c197b818a32
+refs/heads/master: a7f5bf9b95ace39cd8b61e8c9ca1035966779ed1
diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig
index b77abce10c7a..bc08c7f0883f 100644
--- a/trunk/arch/avr32/Kconfig
+++ b/trunk/arch/avr32/Kconfig
@@ -219,6 +219,8 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/avr32/Kconfig.debug"
 
 source "security/Kconfig"
diff --git a/trunk/arch/avr32/Kconfig.debug b/trunk/arch/avr32/Kconfig.debug
index 64ace00fe6cb..2283933a9a93 100644
--- a/trunk/arch/avr32/Kconfig.debug
+++ b/trunk/arch/avr32/Kconfig.debug
@@ -6,14 +6,4 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
-config KPROBES
-	bool "Kprobes"
-	depends on DEBUG_KERNEL
-	help
-	  Kprobes allows you to trap at almost any kernel address and
-          execute a callback function.  register_kprobe() establishes
-          a probepoint and specifies the callback.  Kprobes is useful
-          for kernel debugging, non-intrusive instrumentation and testing.
-          If in doubt, say "N".
-
 endmenu