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.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
include
/
linux
/
oprofile.h
diff --git
a/include/linux/oprofile.h
b/include/linux/oprofile.h
index
7f5cfd3
..
49c8727
100644
(file)
--- a/
include/linux/oprofile.h
+++ b/
include/linux/oprofile.h
@@
-18,7
+18,7
@@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/printk.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
/* Each escaped entry is prefixed by ESCAPE_CODE
* then one of the following codes, then the