From 50e84a24d1739134420dd5406497603ce9d8ebd4 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 7 Dec 2009 17:12:58 +0100
Subject: [PATCH] --- yaml --- r: 175415 b: refs/heads/master c:
 2ff6cfd70720780234fdfea636218c2a62b31287 h: refs/heads/master i:   175413:
 a290695556a9baa143e5679b5862099804b382ec   175411:
 93c98c2411535543b229db633349afec2fddfb7d   175407:
 42de3193b8a0732fc6fc7b08f2d2d15e37b86e8e v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/perf_event.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0fedd85055b8..64ebd54daccb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3a2dbf844d81b4b9c9ad6044563c294e7a48cac
+refs/heads/master: 2ff6cfd70720780234fdfea636218c2a62b31287
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
index 89098e35a036..bf3329413e18 100644
--- a/trunk/include/linux/perf_event.h
+++ b/trunk/include/linux/perf_event.h
@@ -18,10 +18,6 @@
 #include <linux/ioctl.h>
 #include <asm/byteorder.h>
 
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-#include <asm/hw_breakpoint.h>
-#endif
-
 /*
  * User-space ABI bits:
  */
@@ -451,6 +447,10 @@ enum perf_callchain_context {
 # include <asm/perf_event.h>
 #endif
 
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+#include <asm/hw_breakpoint.h>
+#endif
+
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/rculist.h>