summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorcube <cube@NetBSD.org>2008-03-17 00:53:12 +0000
committercube <cube@NetBSD.org>2008-03-17 00:53:12 +0000
commit9f2d68dedf7c8fa50df1399a30dafb431eb6fa4a (patch)
tree8e12324028354b5f7b3c997b11e626f1991664b8 /sys
parent2d19d2a3e9f0f9e051349c407f9d6f55a1ecb9d4 (diff)
Fix fallout from softc split.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/pnpbios/fdc_pnpbios.c6
-rw-r--r--sys/dev/pcmcia/opl_esl.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/pnpbios/fdc_pnpbios.c b/sys/arch/i386/pnpbios/fdc_pnpbios.c
index f5ef4e5ac68..2387614f7f6 100644
--- a/sys/arch/i386/pnpbios/fdc_pnpbios.c
+++ b/sys/arch/i386/pnpbios/fdc_pnpbios.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pnpbios.c,v 1.12 2008/03/16 00:58:56 cube Exp $ */
+/* $NetBSD: fdc_pnpbios.c,v 1.13 2008/03/17 00:53:12 cube Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.12 2008/03/16 00:58:56 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.13 2008/03/17 00:53:12 cube Exp $");
#include "rnd.h"
@@ -93,7 +93,7 @@ void
fdc_pnpbios_attach(device_t parent, device_t self, void *aux)
{
struct fdc_pnpbios_softc *pdc = device_private(self);
- struct fdc_softc *fdc = &pdc->sd_fdc;
+ struct fdc_softc *fdc = &pdc->sc_fdc;
struct pnpbiosdev_attach_args *aa = aux;
int size, base;
diff --git a/sys/dev/pcmcia/opl_esl.c b/sys/dev/pcmcia/opl_esl.c
index d5956f8101e..972f4136919 100644
--- a/sys/dev/pcmcia/opl_esl.c
+++ b/sys/dev/pcmcia/opl_esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_esl.c,v 1.16 2008/03/15 23:14:38 cube Exp $ */
+/* $NetBSD: opl_esl.c,v 1.17 2008/03/17 00:53:50 cube Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.16 2008/03/15 23:14:38 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.17 2008/03/17 00:53:50 cube Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ opl_esl_attach(device_t parent, device_t self, void *aux)
struct esl_pcmcia_softc *ssc = device_private(parent);
struct opl_softc *sc = device_private(self);
- sc->sc_mididev.dev = self;
+ sc->mididev.dev = self;
sc->iot = ssc->sc_iot;
sc->ioh = ssc->sc_ioh;
sc->offs = 0;