From 9ceedf231bb21f54c43717b3c157e0b87388e27d Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 5 Jun 2008 14:45:32 +0000 Subject: [PATCH] Rename the ie_EE16 module to just 'ie' so that at least one of the modules for this driver is called 'ie'. Otherwise, ifconfig(8) doesn't recognize any of the modules as being the ie(4) driver and will always try to kldload the driver even when it is already present in the kernel. Reported by: Thierry Herbelot --- sys/dev/ie/if_ie_isa.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c index cc62fa3cf481..5b0ba887bafc 100644 --- a/sys/dev/ie/if_ie_isa.c +++ b/sys/dev/ie/if_ie_isa.c @@ -802,11 +802,13 @@ static device_method_t ie_isa_3C507_methods[] = { DEVMETHOD(device_detach, ie_detach), { 0, 0 } }; + static driver_t ie_isa_3C507_driver = { "ie", ie_isa_3C507_methods, sizeof(struct ie_softc), }; + DRIVER_MODULE(ie_3C507, isa, ie_isa_3C507_driver, ie_devclass, ie_modevent, 0); MODULE_DEPEND(ie_3C507, elink, 1, 1, 1); @@ -817,12 +819,14 @@ static device_method_t ie_isa_ee16_methods[] = { DEVMETHOD(device_detach, ie_detach), { 0, 0 } }; + static driver_t ie_isa_ee16_driver = { "ie", ie_isa_ee16_methods, sizeof(struct ie_softc), }; -DRIVER_MODULE(ie_EE16, isa, ie_isa_ee16_driver, ie_devclass, ie_modevent, 0); + +DRIVER_MODULE(ie, isa, ie_isa_ee16_driver, ie_devclass, ie_modevent, 0); static device_method_t ie_isa_sl_methods[] = { DEVMETHOD(device_probe, ie_isa_sl_probe), @@ -830,11 +834,13 @@ static device_method_t ie_isa_sl_methods[] = { DEVMETHOD(device_detach, ie_detach), { 0, 0 } }; + static driver_t ie_isa_sl_driver = { "ie", ie_isa_sl_methods, sizeof(struct ie_softc), }; + DRIVER_MODULE(ie_SL, isa, ie_isa_sl_driver, ie_devclass, ie_modevent, 0); static int