diff options
| author |   Tony Luck <tony.luck@intel.com> | 2011-01-13 14:49:56 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-01-13 14:49:56 -0800 |
| commit | 09579770dcb8769f4f61046dcd01cc758cfa6d91 (patch) | |
| tree | bd486d1775bcbfd627f2c31f24a2c58e3cd4e8da /arch/ia64 | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff) | |
| download | linux-dev-09579770dcb8769f4f61046dcd01cc758cfa6d91.tar.xz linux-dev-09579770dcb8769f4f61046dcd01cc758cfa6d91.zip | |
[IA64] fix build error - arch/ia64/kernel/perfmon.c
arch/ia64/kernel/perfmon.c:621: error: duplicate 'static'
Introduced by commit c74a1cbb3cac348f276fabc381758f5b0b4713b2
pass default dentry_operations to mount_pseudo()
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index ac76da099a6d..89accc626b86 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -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) |