Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix build error - arch/ia64/kernel/perfmon.c
This commit is contained in:
commit
375b6f5a40
@ -618,7 +618,7 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
|
||||
}
|
||||
|
||||
/* forward declaration */
|
||||
static static const struct dentry_operations pfmfs_dentry_operations;
|
||||
static const struct dentry_operations pfmfs_dentry_operations;
|
||||
|
||||
static struct dentry *
|
||||
pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data)
|
||||
|
Loading…
Reference in New Issue
Block a user