diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 17:29:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 17:29:53 -0800 |
| commit | 375b6f5a40a3d8373561a3dbeed440a845e6d379 (patch) | |
| tree | 7fe903bdfd0f67436c648394b0bcbdda55379689 /arch | |
| parent | Revert "gpiolib: annotate gpio-intialization with __must_check" (diff) | |
| parent | [IA64] fix build error - arch/ia64/kernel/perfmon.c (diff) | |
| download | linux-dev-375b6f5a40a3d8373561a3dbeed440a845e6d379.tar.xz linux-dev-375b6f5a40a3d8373561a3dbeed440a845e6d379.zip | |
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
Diffstat (limited to 'arch')
| -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) |