Module Name: src
Committed By: martin
Date: Thu May 30 16:01:25 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: fdc.c
Log Message:
Make it compile again
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sparc64/dev/fdc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.37 src/sys/arch/sparc64/dev/fdc.c:1.38
--- src/sys/arch/sparc64/dev/fdc.c:1.37 Wed May 29 00:47:48 2013
+++ src/sys/arch/sparc64/dev/fdc.c Thu May 30 16:01:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.37 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: fdc.c,v 1.38 2013/05/30 16:01:25 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.37 2013/05/29 00:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.38 2013/05/30 16:01:25 martin Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -2575,7 +2575,7 @@ fd_set_geometry(struct fd_softc *fd)
return;
}
- struct disk_geom *dg = &fd->sc_dkdev.dk_geom;
+ struct disk_geom *dg = &fd->sc_dk.dk_geom;
memset(dg, 0, sizeof(*dg));
dg->dg_secperunit = fdt->size;
@@ -2591,6 +2591,6 @@ fd_set_geometry(struct fd_softc *fd)
break;
}
dg->dg_ntracks = fdt->heads;
- dg->dg_ncylinders = fdt->cyls;
- disk_set_info(fd->sc_dev, &fd->sc_dkdev, NULL);
+ dg->dg_ncylinders = fdt->cylinders;
+ disk_set_info(fd->sc_dev, &fd->sc_dk, NULL);
}
