diff options
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/files.i386 | 3 | ||||
| -rw-r--r-- | sys/i386/isa/fd.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 0896633..1b669cc 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.107 1995/09/07 08:17:19 swallace Exp $ +# $Id: files.i386,v 1.108 1995/09/08 03:20:10 julian Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -111,7 +111,6 @@ i386/isa/pcvt/pcvt_sup.c optional vt device-driver i386/isa/pcvt/pcvt_vtf.c optional vt device-driver i386/isa/psm.c optional psm device-driver i386/isa/rc.c optional rc device-driver -i386/isa/readMBR.c standard i386/isa/scd.c optional scd device-driver i386/isa/seagate.c optional sea device-driver i386/isa/si.c optional si device-driver diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 17bef91..d0748b1 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.62 1995/06/11 19:31:19 rgrimes Exp $ + * $Id: fd.c,v 1.63 1995/09/03 05:43:28 julian Exp $ * */ @@ -1834,7 +1834,8 @@ fdioctl(dev, cmd, addr, flag, p) dl->d_secpercyl = fdt->size / fdt->tracks; dl->d_type = DTYPE_FLOPPY; - if (readdisklabel(dev, fdstrategy, dl, NULL, 0) == NULL) + if (readdisklabel(dkmodpart(dev, RAW_PART), fdstrategy, dl) + == NULL) error = 0; else error = EINVAL; @@ -1861,8 +1862,8 @@ fdioctl(dev, cmd, addr, flag, p) dl = (struct disklabel *)addr; - if ((error = - setdisklabel ((struct disklabel *)buffer, dl, 0))) + if ((error = setdisklabel((struct disklabel *)buffer, dl, + (u_long)0)) != 0) break; error = writedisklabel(dev, fdstrategy, |
