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/teigland/dlm
[pandora-kernel.git]
/
include
/
linux
/
Kbuild
diff --git
a/include/linux/Kbuild
b/include/linux/Kbuild
index
97a88b2
..
cbb5ccb
100644
(file)
--- a/
include/linux/Kbuild
+++ b/
include/linux/Kbuild
@@
-100,7
+100,7
@@
header-y += ixjuser.h
header-y += jffs2.h
header-y += keyctl.h
header-y += limits.h
-header-y +=
lock_
dlm_plock.h
+header-y += dlm_plock.h
header-y += magic.h
header-y += major.h
header-y += matroxfb.h