diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/s390/hypfs/hypfs.h | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/s390/hypfs/hypfs.h')
| -rw-r--r-- | arch/s390/hypfs/hypfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h index 80c1526f2af3..d9df5a060a83 100644 --- a/arch/s390/hypfs/hypfs.h +++ b/arch/s390/hypfs/hypfs.h | |||
| @@ -47,7 +47,7 @@ struct hypfs_dbfs_data { | |||
| 47 | void *buf; | 47 | void *buf; |
| 48 | void *buf_free_ptr; | 48 | void *buf_free_ptr; |
| 49 | size_t size; | 49 | size_t size; |
| 50 | struct hypfs_dbfs_file *dbfs_file;; | 50 | struct hypfs_dbfs_file *dbfs_file; |
| 51 | struct kref kref; | 51 | struct kref kref; |
| 52 | }; | 52 | }; |
| 53 | 53 | ||