summaryrefslogtreecommitdiffstats
path: root/arch/i386/boot/tools
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
commitc7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch)
tree3682407a599b8f9f03fc096298134cafba1c9b2f /arch/i386/boot/tools
parent1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff)
o Merge with Linux 2.1.116.
o New Newport console code. o New G364 console code.
Diffstat (limited to 'arch/i386/boot/tools')
-rw-r--r--arch/i386/boot/tools/build.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/boot/tools/build.c b/arch/i386/boot/tools/build.c
index 5224a6e7b..b5faf665c 100644
--- a/arch/i386/boot/tools/build.c
+++ b/arch/i386/boot/tools/build.c
@@ -62,7 +62,7 @@ void die(const char * str, ...)
#define MINIX_HEADER_LEN 32
-int minix_open(const char *name)
+void minix_open(const char *name)
{
static byte hdr[] = { 0x01, 0x03, 0x10, 0x04, 0x20, 0x00, 0x00, 0x00 };
static u32 *lb = (u32 *) buf;
@@ -187,7 +187,7 @@ int main(int argc, char ** argv)
}
close(fd);
- if (lseek(1, 497, SEEK_SET) != 497) /* Write sizes to the bootsector */
+ if (lseek(1, 497, SEEK_SET) != 497) /* Write sizes to the boot sector */
die("Output: seek failed");
buf[0] = setup_sectors;
if (write(1, buf, 1) != 1)