diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /fs/partitions/osf.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/partitions/osf.c')
| -rw-r--r-- | fs/partitions/osf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/osf.c b/fs/partitions/osf.c index fc22b85d436a..48cec7cbca17 100644 --- a/fs/partitions/osf.c +++ b/fs/partitions/osf.c | |||
| @@ -72,7 +72,7 @@ int osf_partition(struct parsed_partitions *state) | |||
| 72 | le32_to_cpu(partition->p_size)); | 72 | le32_to_cpu(partition->p_size)); |
| 73 | slot++; | 73 | slot++; |
| 74 | } | 74 | } |
| 75 | printk("\n"); | 75 | strlcat(state->pp_buf, "\n", PAGE_SIZE); |
| 76 | put_dev_sector(sect); | 76 | put_dev_sector(sect); |
| 77 | return 1; | 77 | return 1; |
| 78 | } | 78 | } |