diff --git a/[refs] b/[refs]
index d3b2faead62a..c6d784a8a667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c36c282b88963d0957368a443168588e62301fda
+refs/heads/master: bd807f9c5b90c236c3d173a5815d620bc1b1316d
diff --git a/trunk/include/asm-ia64/rwsem.h b/trunk/include/asm-ia64/rwsem.h
index 2d1640cc240a..8aba06a7b038 100644
--- a/trunk/include/asm-ia64/rwsem.h
+++ b/trunk/include/asm-ia64/rwsem.h
@@ -21,6 +21,10 @@
 #ifndef _ASM_IA64_RWSEM_H
 #define _ASM_IA64_RWSEM_H
 
+#ifndef _LINUX_RWSEM_H
+#error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead."
+#endif
+
 #include <linux/list.h>
 #include <linux/spinlock.h>