summaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 13:44:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 13:44:23 -0700
commit03b883840c630c7b571690577809754739ac773f (patch)
treeaeec0581accf5e19360205e21dd25a220b4a0e54 /include/linux/Kbuild
parent0d07a15bdb5a4ea6271b6e874d307c48151ef546 (diff)
parentc1c76743e98346eb052b707f0e054377a09441d1 (diff)
downloadblackbird-op-linux-03b883840c630c7b571690577809754739ac773f.tar.gz
blackbird-op-linux-03b883840c630c7b571690577809754739ac773f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: linux/{dlm,dlm_device}.h: cleanup for userspace dlm: common max length definitions dlm: move plock code from gfs2 dlm: recover nodes that are removed and re-added dlm: save master info after failed no-queue request dlm: make dlm_print_rsb() static dlm: match signedness between dlm_config_info and cluster_set
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 97a88b2b0c8e..cbb5ccb27de3 100644
--- 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
OpenPOWER on IntegriCloud