diff --git a/[refs] b/[refs]
index 3c19aaf821ca..815ba002f037 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cae60feb6709dea4cb94da93d4d2ea039aee59d
+refs/heads/master: 22a685d09bb98810670ac0fb02c2138bdbf038cc
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
index b6b1f5ab5354..56627c1546de 100644
--- a/trunk/Documentation/feature-removal-schedule.txt
+++ b/trunk/Documentation/feature-removal-schedule.txt
@@ -40,3 +40,11 @@ Why:	Replaced by io_remap_pfn_range() which allows more memory space
 	addressabilty (by using a pfn) and supports sparc & sparc64
 	iospace as part of the pfn.
 Who:	Randy Dunlap <rddunlap@osdl.org>
+
+---------------------------
+
+What:	register_ioctl32_conversion() / unregister_ioctl32_conversion()
+When:	April 2005
+Why:	Replaced by ->compat_ioctl in file_operations and other method
+	vecors.
+Who:	Andi Kleen <ak@muc.de>, Christoph Hellwig <hch@lst.de>
diff --git a/trunk/include/linux/ioctl32.h b/trunk/include/linux/ioctl32.h
index e1a641819428..e8c4af32b3bb 100644
--- a/trunk/include/linux/ioctl32.h
+++ b/trunk/include/linux/ioctl32.h
@@ -1,6 +1,8 @@
 #ifndef IOCTL32_H
 #define IOCTL32_H 1
 
+#include <linux/compiler.h>	/* for __deprecated */
+
 struct file;
 
 typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int,
@@ -23,9 +25,9 @@ struct ioctl_trans {
  */ 
 
 #ifdef CONFIG_COMPAT
-extern int register_ioctl32_conversion(unsigned int cmd,
+extern int __deprecated register_ioctl32_conversion(unsigned int cmd,
 				ioctl_trans_handler_t handler);
-extern int unregister_ioctl32_conversion(unsigned int cmd);
+extern int __deprecated unregister_ioctl32_conversion(unsigned int cmd);
 
 #else