Merge 'staging-next' to Linus's tree

[pandora-kernel.git] / drivers / staging / autofs / root.c

diff --git a/drivers/staging/autofs/root.c b/drivers/staging/autofs/root.c
index 70210aa..0fdec4b 100644 (file)
--- a/drivers/staging/autofs/root.c
+++ b/drivers/staging/autofs/root.c
@@ -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,