diff options
| author | imp <imp@FreeBSD.org> | 1999-10-16 05:11:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1999-10-16 05:11:46 +0000 |
| commit | e1bc0f1b8d596292bf45c8607c02889fe51fa26d (patch) | |
| tree | 820c8ec1fc65545034bd000f73b5676cc4d8548d /sys/pccard/pccard.c | |
| parent | c80f4f24245078056a7382cc0b5100280ca25b7b (diff) | |
| download | FreeBSD-src-e1bc0f1b8d596292bf45c8607c02889fe51fa26d.zip FreeBSD-src-e1bc0f1b8d596292bf45c8607c02889fe51fa26d.tar.gz | |
Remove name field from controller information. Fix name setting in
pc98 case that I missed before. Attempt to get the irq for the PCIC
first from the loader env var and second from the config system. I've
been able to boot my laptop with a kernel that hardwired the irq to
10. This should allow boot -c to finally start working for pcic irq,
but I've not tested that. Add $FreeBSD$ to slot.h.
Diffstat (limited to 'sys/pccard/pccard.c')
| -rw-r--r-- | sys/pccard/pccard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 0908594..44c6993 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -514,13 +514,13 @@ pccard_alloc_slot(struct slot_ctrl *ctrl) ap = &s_hook[slt->slotnum]; ap->ah_fun = slot_suspend; ap->ah_arg = (void *)slt; - ap->ah_name = ctrl->name; + ap->ah_name = "pcccard"; ap->ah_order = APM_MID_ORDER; apm_hook_establish(APM_HOOK_SUSPEND, ap); ap = &r_hook[slt->slotnum]; ap->ah_fun = slot_resume; ap->ah_arg = (void *)slt; - ap->ah_name = ctrl->name; + ap->ah_name = "pccard"; ap->ah_order = APM_MID_ORDER; apm_hook_establish(APM_HOOK_RESUME, ap); } |
