Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (375b6f5a) · Commits · e / devices / android_kernel_teracube_emerald

arch/ia64/kernel/perfmon.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -618,7 +618,7 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
	}		}

	/* forward declaration */		/* forward declaration */
	static static const struct dentry_operations pfmfs_dentry_operations;		static const struct dentry_operations pfmfs_dentry_operations;

	static struct dentry *		static struct dentry *
	pfmfs_mount(struct file_system_type fs_type, int flags, const char dev_name, void *data)		pfmfs_mount(struct file_system_type fs_type, int flags, const char dev_name, void *data)