diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-27 08:08:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-27 08:08:09 -0400 |
| commit | b1d2dc3c06d8da7d58fb43d7123a91c1d6a4f576 (patch) | |
| tree | 425e774abcf88bad87ba4e25ccae7a9f49b56aab /drivers | |
| parent | 75911c9bd1134f8c0b682aa1e8a8dbefec3ca07a (diff) | |
| parent | b76a06e08d94b2a63e47837dfe46bbbf0a3af6c2 (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/oprofile/event_buffer.h | 2 | ||||
| -rw-r--r-- | drivers/oprofile/oprof.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h index 4e70749f8d16..a8d5bb3cba89 100644 --- a/drivers/oprofile/event_buffer.h +++ b/drivers/oprofile/event_buffer.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #define EVENT_BUFFER_H | 11 | #define EVENT_BUFFER_H |
| 12 | 12 | ||
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | #include <asm/mutex.h> | 14 | #include <linux/mutex.h> |
| 15 | 15 | ||
| 16 | int alloc_event_buffer(void); | 16 | int alloc_event_buffer(void); |
| 17 | 17 | ||
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c index f9bda64fcd1b..dccd8636095c 100644 --- a/drivers/oprofile/oprof.c +++ b/drivers/oprofile/oprof.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/moduleparam.h> | 14 | #include <linux/moduleparam.h> |
| 15 | #include <linux/workqueue.h> | 15 | #include <linux/workqueue.h> |
| 16 | #include <linux/time.h> | 16 | #include <linux/time.h> |
| 17 | #include <asm/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | 18 | ||
| 19 | #include "oprof.h" | 19 | #include "oprof.h" |
| 20 | #include "event_buffer.h" | 20 | #include "event_buffer.h" |