diff options
author | Pavel Roskin <proski@gnu.org> | 2005-09-24 00:58:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 03:33:51 -0400 |
commit | 7a716536c602be6050b4f3ece30f1fc3b64362b0 (patch) | |
tree | 58ed691a144e75b81b712ccdf5daccebbe58693a /drivers/net/wireless/hostap | |
parent | 8cee0cd5bec53b78dd3c43a73b27821a688133e6 (diff) |
[PATCH] hostap: Fix pci_driver name for hostap_plx and hostap_pci
hostap_pci and hostap_plx drivers still use PCI driver names
"prism2_pci" and "prism2_plx" respectively. This is unfriendly to
linux-wlan-ng, which uses the same names. So, if e.g. hostap_pci and
prism2_pci are loaded, they will "share" /sys/bus/pci/drivers/prism2_plx
directory.
Change PCI driver names of hostap_pci and hostap_plx to be equal to
their module names.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless/hostap')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_pci.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_plx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index 025f8cdb5566..b9254f73fbaf 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
@@ -441,7 +441,7 @@ static int prism2_pci_resume(struct pci_dev *pdev) | |||
441 | MODULE_DEVICE_TABLE(pci, prism2_pci_id_table); | 441 | MODULE_DEVICE_TABLE(pci, prism2_pci_id_table); |
442 | 442 | ||
443 | static struct pci_driver prism2_pci_drv_id = { | 443 | static struct pci_driver prism2_pci_drv_id = { |
444 | .name = "prism2_pci", | 444 | .name = "hostap_pci", |
445 | .id_table = prism2_pci_id_table, | 445 | .id_table = prism2_pci_id_table, |
446 | .probe = prism2_pci_probe, | 446 | .probe = prism2_pci_probe, |
447 | .remove = prism2_pci_remove, | 447 | .remove = prism2_pci_remove, |
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index 474ef83d813e..1abebdf48b20 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c | |||
@@ -616,7 +616,7 @@ static void prism2_plx_remove(struct pci_dev *pdev) | |||
616 | MODULE_DEVICE_TABLE(pci, prism2_plx_id_table); | 616 | MODULE_DEVICE_TABLE(pci, prism2_plx_id_table); |
617 | 617 | ||
618 | static struct pci_driver prism2_plx_drv_id = { | 618 | static struct pci_driver prism2_plx_drv_id = { |
619 | .name = "prism2_plx", | 619 | .name = "hostap_plx", |
620 | .id_table = prism2_plx_id_table, | 620 | .id_table = prism2_plx_id_table, |
621 | .probe = prism2_plx_probe, | 621 | .probe = prism2_plx_probe, |
622 | .remove = prism2_plx_remove, | 622 | .remove = prism2_plx_remove, |