diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 22:17:25 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 22:17:25 +0200 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /fs/partitions/sun.c | |
| parent | Merge branch 'upstream-fixes' into upstream (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-e4ac2663ea27d5dda88d97d117080995fcfcd6d5.tar.xz linux-e4ac2663ea27d5dda88d97d117080995fcfcd6d5.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'fs/partitions/sun.c')
| -rw-r--r-- | fs/partitions/sun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/sun.c b/fs/partitions/sun.c index abe91ca03edf..0a5927c806ca 100644 --- a/fs/partitions/sun.c +++ b/fs/partitions/sun.c @@ -74,7 +74,7 @@ int sun_partition(struct parsed_partitions *state, struct block_device *bdev) spc = be16_to_cpu(label->ntrks) * be16_to_cpu(label->nsect); for (i = 0; i < 8; i++, p++) { unsigned long st_sector; - int num_sectors; + unsigned int num_sectors; st_sector = be32_to_cpu(p->start_cylinder) * spc; num_sectors = be32_to_cpu(p->num_sectors); |