diff --git a/[refs] b/[refs]
index 6c6e20df1b0e..d60825a36300 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f18d1e8d07ae67dd0afce875287756d4bd31a46
+refs/heads/master: e44aef58ecfbe061eb4c53b939bcc35fb1bee82d
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
index ec77d1643d37..cc3a75a239a9 100644
--- a/trunk/include/linux/perf_counter.h
+++ b/trunk/include/linux/perf_counter.h
@@ -14,7 +14,10 @@
 #define _LINUX_PERF_COUNTER_H
 
 #include <asm/atomic.h>
-#include <asm/perf_counter.h>
+
+#ifdef CONFIG_PERF_COUNTERS
+# include <asm/perf_counter.h>
+#endif
 
 #include <linux/list.h>
 #include <linux/mutex.h>