diff options
| author | nate <nate@FreeBSD.org> | 1997-10-26 21:08:42 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1997-10-26 21:08:42 +0000 |
| commit | fa55951ed537b4c4f68482e66fc7123eab0cf3fc (patch) | |
| tree | 0439bf497279cd9e48c661b7d3e61a65cd486efb /sys/i386/isa/aic6360.c | |
| parent | c76c50d092e899d58a0c957da71951be8e875d62 (diff) | |
| download | FreeBSD-src-fa55951ed537b4c4f68482e66fc7123eab0cf3fc.zip FreeBSD-src-fa55951ed537b4c4f68482e66fc7123eab0cf3fc.tar.gz | |
- Instead of relying on a functional call to register PCARD-capable drivers,
use a Linker Set. Note, if a driver is loaded as an LKM if will have
to use the function call, but since none of the existing drivers
are loadable, this made things cleaner and boot messages nicer.
Obtained from: PAO-970616
Diffstat (limited to 'sys/i386/isa/aic6360.c')
| -rw-r--r-- | sys/i386/isa/aic6360.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index 93da5a6..fb2dd6c 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -31,7 +31,7 @@ */ /* - * $Id: aic6360.c,v 1.32 1997/10/21 17:57:31 nate Exp $ + * $Id: aic6360.c,v 1.34 1997/10/26 04:53:49 nate Exp $ * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and @@ -718,6 +718,8 @@ static struct pccard_device aic_info = { &bio_imask /* Interrupt mask for device */ }; +DATA_SET(pccarddrv_set, aic_info); + /* * Initialize the device - called from Slot manager. */ @@ -796,7 +798,6 @@ aicprobe(dev) #if NCARD > 0 int unit = dev->id_unit; int aic_reg_drv[NAIC]; - static int aic_already_init; #else int unit = aicunit; #endif @@ -810,12 +811,6 @@ aicprobe(dev) #if NCARD > 0 if (!aic_reg_drv[unit]) aic_reg_drv[unit] = 1; - - /* If PC-Card probe required, then register with slot manager. */ - if (!aic_already_init) { - pccard_add_driver(&aic_info); - aic_already_init = 1; - } #endif /* |
