diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /arch/i386/boot/tools/build.c | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'arch/i386/boot/tools/build.c')
| -rw-r--r-- | arch/i386/boot/tools/build.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/boot/tools/build.c b/arch/i386/boot/tools/build.c index 4a17956512e1..6835f6d47c31 100644 --- a/arch/i386/boot/tools/build.c +++ b/arch/i386/boot/tools/build.c | |||
| @@ -70,7 +70,8 @@ void usage(void) | |||
| 70 | 70 | ||
| 71 | int main(int argc, char ** argv) | 71 | int main(int argc, char ** argv) |
| 72 | { | 72 | { |
| 73 | unsigned int i, c, sz, setup_sectors; | 73 | unsigned int i, sz, setup_sectors; |
| 74 | int c; | ||
| 74 | u32 sys_size; | 75 | u32 sys_size; |
| 75 | byte major_root, minor_root; | 76 | byte major_root, minor_root; |
| 76 | struct stat sb; | 77 | struct stat sb; |