diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:29:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:29:53 -0500 |
| commit | 375b6f5a40a3d8373561a3dbeed440a845e6d379 (patch) | |
| tree | 7fe903bdfd0f67436c648394b0bcbdda55379689 /arch | |
| parent | d8a3515e2a9523f8ed56d1f4537d16338bda2bc2 (diff) | |
| parent | 09579770dcb8769f4f61046dcd01cc758cfa6d91 (diff) | |
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, | |||
| 618 | } | 618 | } |
| 619 | 619 | ||
| 620 | /* forward declaration */ | 620 | /* forward declaration */ |
| 621 | static static const struct dentry_operations pfmfs_dentry_operations; | 621 | static const struct dentry_operations pfmfs_dentry_operations; |
| 622 | 622 | ||
| 623 | static struct dentry * | 623 | static struct dentry * |
| 624 | pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) | 624 | pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) |