remove now-redunant cardbus attachment.
This commit is contained in:
parent
2a7e13e5ad
commit
155a83e87a
|
@ -54,7 +54,6 @@ static driver_t ahc_pci_driver = {
|
|||
};
|
||||
|
||||
DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_devclass, 0, 0);
|
||||
DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_devclass, 0, 0);
|
||||
MODULE_DEPEND(ahc_pci, ahc, 1, 1, 1);
|
||||
MODULE_VERSION(ahc_pci, 1);
|
||||
|
||||
|
|
|
@ -56,7 +56,6 @@ static driver_t ahd_pci_driver = {
|
|||
static devclass_t ahd_devclass;
|
||||
|
||||
DRIVER_MODULE(ahd, pci, ahd_pci_driver, ahd_devclass, 0, 0);
|
||||
DRIVER_MODULE(ahd, cardbus, ahd_pci_driver, ahd_devclass, 0, 0);
|
||||
MODULE_DEPEND(ahd_pci, ahd, 1, 1, 1);
|
||||
MODULE_VERSION(ahd_pci, 1);
|
||||
|
||||
|
|
|
@ -251,6 +251,5 @@ static driver_t ath_pci_driver = {
|
|||
};
|
||||
static devclass_t ath_devclass;
|
||||
DRIVER_MODULE(if_ath, pci, ath_pci_driver, ath_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_ath, cardbus, ath_pci_driver, ath_devclass, 0, 0);
|
||||
MODULE_VERSION(if_ath, 1);
|
||||
MODULE_DEPEND(if_ath, wlan, 1, 1, 1); /* 802.11 media layer */
|
||||
|
|
|
@ -331,7 +331,6 @@ static driver_t dc_driver = {
|
|||
|
||||
static devclass_t dc_devclass;
|
||||
|
||||
DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
|
||||
DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
|
|
|
@ -553,4 +553,3 @@ static devclass_t fwohci_devclass;
|
|||
MODULE_DEPEND(fwohci, firewire, 1, 1, 1);
|
||||
#endif
|
||||
DRIVER_MODULE(fwohci, pci, fwohci_driver, fwohci_devclass, 0, 0);
|
||||
DRIVER_MODULE(fwohci, cardbus, fwohci_driver, fwohci_devclass, 0, 0);
|
||||
|
|
|
@ -293,7 +293,6 @@ static driver_t fxp_driver = {
|
|||
static devclass_t fxp_devclass;
|
||||
|
||||
DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
|
||||
DRIVER_MODULE(fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
static struct resource_spec fxp_res_spec_mem[] = {
|
||||
|
|
|
@ -103,7 +103,6 @@ static driver_t ndis_driver = {
|
|||
static devclass_t ndis_devclass;
|
||||
|
||||
DRIVER_MODULE(ndis, pci, ndis_driver, ndis_devclass, ndisdrv_modevent, 0);
|
||||
DRIVER_MODULE(ndis, cardbus, ndis_driver, ndis_devclass, ndisdrv_modevent, 0);
|
||||
|
||||
static int
|
||||
ndis_devcompare(bustype, t, dev)
|
||||
|
|
|
@ -203,7 +203,6 @@ static driver_t ipw_driver = {
|
|||
static devclass_t ipw_devclass;
|
||||
|
||||
DRIVER_MODULE(ipw, pci, ipw_driver, ipw_devclass, 0, 0);
|
||||
DRIVER_MODULE(ipw, cardbus, ipw_driver, ipw_devclass, 0, 0);
|
||||
|
||||
static int
|
||||
ipw_probe(device_t dev)
|
||||
|
|
|
@ -367,7 +367,6 @@ static driver_t malo_pci_driver = {
|
|||
|
||||
static devclass_t malo_devclass;
|
||||
DRIVER_MODULE(if_malo, pci, malo_pci_driver, malo_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_malo, cardbus, malo_pci_driver, malo_devclass, 0, 0);
|
||||
MODULE_VERSION(if_malo, 1);
|
||||
MODULE_DEPEND(if_malo, wlan, 1, 1, 1); /* 802.11 media layer */
|
||||
MODULE_DEPEND(if_malo, malofw_fw, 1, 1, 1);
|
||||
|
|
|
@ -145,7 +145,6 @@ static driver_t ral_pci_driver = {
|
|||
static devclass_t ral_devclass;
|
||||
|
||||
DRIVER_MODULE(ral, pci, ral_pci_driver, ral_devclass, 0, 0);
|
||||
DRIVER_MODULE(ral, cardbus, ral_pci_driver, ral_devclass, 0, 0);
|
||||
|
||||
static int
|
||||
ral_pci_probe(device_t dev)
|
||||
|
|
|
@ -124,4 +124,3 @@ sio_pci_probe(dev)
|
|||
}
|
||||
|
||||
DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0);
|
||||
DRIVER_MODULE(sio, cardbus, sio_pci_driver, sio_devclass, 0, 0);
|
||||
|
|
|
@ -2109,7 +2109,6 @@ static driver_t emu_driver = {
|
|||
};
|
||||
|
||||
DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0);
|
||||
DRIVER_MODULE(snd_emu10k1, cardbus, emu_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_emu10k1, 1);
|
||||
MODULE_DEPEND(snd_emu10k1, midi, 1, 1, 1);
|
||||
|
|
|
@ -3556,5 +3556,4 @@ emu_modevent(module_t mod __unused, int cmd, void *data __unused)
|
|||
static devclass_t emu_devclass;
|
||||
|
||||
DRIVER_MODULE(snd_emu10kx, pci, emu_driver, emu_devclass, emu_modevent, NULL);
|
||||
DRIVER_MODULE(snd_emu10kx, cardbus, emu_driver, emu_devclass, emu_modevent, NULL);
|
||||
MODULE_VERSION(snd_emu10kx, SND_EMU10KX_PREFVER);
|
||||
|
|
|
@ -160,4 +160,3 @@ uart_pci_probe(device_t dev)
|
|||
}
|
||||
|
||||
DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, 0, 0);
|
||||
DRIVER_MODULE(uart, cardbus, uart_pci_driver, uart_devclass, 0, 0);
|
||||
|
|
|
@ -482,5 +482,4 @@ static driver_t ehci_driver =
|
|||
static devclass_t ehci_devclass;
|
||||
|
||||
DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0);
|
||||
DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0);
|
||||
MODULE_DEPEND(ehci, usb, 1, 1, 1);
|
||||
|
|
|
@ -383,5 +383,4 @@ static driver_t ohci_driver =
|
|||
static devclass_t ohci_devclass;
|
||||
|
||||
DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0);
|
||||
DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0);
|
||||
MODULE_DEPEND(ohci, usb, 1, 1, 1);
|
||||
|
|
|
@ -439,5 +439,4 @@ static driver_t uhci_driver =
|
|||
static devclass_t uhci_devclass;
|
||||
|
||||
DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0);
|
||||
DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0);
|
||||
MODULE_DEPEND(uhci, usb, 1, 1, 1);
|
||||
|
|
|
@ -221,7 +221,6 @@ static driver_t vge_driver = {
|
|||
static devclass_t vge_devclass;
|
||||
|
||||
DRIVER_MODULE(vge, pci, vge_driver, vge_devclass, 0, 0);
|
||||
DRIVER_MODULE(vge, cardbus, vge_driver, vge_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, vge, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#ifdef VGE_EEPROM
|
||||
|
|
|
@ -314,7 +314,6 @@ static driver_t xl_driver = {
|
|||
|
||||
static devclass_t xl_devclass;
|
||||
|
||||
DRIVER_MODULE(xl, cardbus, xl_driver, xl_devclass, 0, 0);
|
||||
DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
|
|
Loading…
Reference in New Issue