Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6

[linux-2.6-omap-h63xx.git] / fs / dlm / dlm_internal.h

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index 73c36f501707a5d1dac708ee0cd18a345861c734..5a7ac33b629cf5db96d6546ee2b394809c4278d3 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -37,7 +37,6 @@
 #include <linux/jhash.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/dlm.h>