diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-26 13:27:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-26 13:27:51 +1000 |
| commit | 5953dbd9fd5a58ca86b143e947411b33b3d491e8 (patch) | |
| tree | 941e30cbf849e3f15285bc417e0f7ca78ae4de40 /drivers | |
| parent | 0fbd9ebd604bb0a1239e25c1d5cf36a5cbd80993 (diff) | |
| parent | b76a06e08d94b2a63e47837dfe46bbbf0a3af6c2 (diff) | |
Merge remote-tracking branch 'oprofile/for-next'
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 @@ #define EVENT_BUFFER_H #include <linux/types.h> -#include <asm/mutex.h> +#include <linux/mutex.h> int alloc_event_buffer(void); 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 @@ #include <linux/moduleparam.h> #include <linux/workqueue.h> #include <linux/time.h> -#include <asm/mutex.h> +#include <linux/mutex.h> #include "oprof.h" #include "event_buffer.h" |