Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / autofs / root.c

diff --git a/fs/autofs/root.c b/drivers/staging/autofs/root.c
similarity index 99%
rename from fs/autofs/root.c
rename to drivers/staging/autofs/root.c
index 11b1ea786d006472cc93cd0f33e6f787445ef569..0fdec4befd8400075ef8cb94a03fede184c0c5cb 100644 (file)
--- a/fs/autofs/root.c
+++ b/drivers/staging/autofs/root.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/root.c
+ * drivers/staging/autofs/root.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
@@ -27,7 +27,9 @@ static int autofs_root_unlink(struct inode *,struct dentry *);
 static int autofs_root_rmdir(struct inode *,struct dentry *);
 static int autofs_root_mkdir(struct inode *,struct dentry *,int);
 static long autofs_root_ioctl(struct file *,unsigned int,unsigned long);
+#ifdef CONFIG_COMPAT
 static long autofs_root_compat_ioctl(struct file *,unsigned int,unsigned long);
+#endif
 
 const struct file_operations autofs_root_operations = {
        .llseek         = generic_file_llseek,