git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
drivers
/
oprofile
/
oprof.c
diff --git
a/drivers/oprofile/oprof.c
b/drivers/oprofile/oprof.c
index
f9bda64
..
dccd863
100644
(file)
--- 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"