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 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
include
/
linux
/
jbd.h
diff --git
a/include/linux/jbd.h
b/include/linux/jbd.h
index
423f582
..
07a9b52
100644
(file)
--- a/
include/linux/jbd.h
+++ b/
include/linux/jbd.h
@@
-32,8
+32,6
@@
#include <linux/timer.h>
#include <linux/lockdep.h>
-#include <asm/semaphore.h>
-
#define journal_oom_retry 1
/*