diff options
| author |   Christian Lamparter <chunkeey@web.de> | 2009-06-23 10:39:45 -0500 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:02:24 -0400 |
| commit | d8c9210757605c5191d2d9f4e09be5e59ceac824 (patch) | |
| tree | 45f0b0c76771c40e14ec49807247ea5ec27439f7 /drivers/net/wireless/p54/p54usb.c | |
| parent | p54: Move TX/RX code (diff) | |
| download | linux-dev-d8c9210757605c5191d2d9f4e09be5e59ceac824.tar.xz linux-dev-d8c9210757605c5191d2d9f4e09be5e59ceac824.zip | |
p54: Modify p54 files for new organization
Modify the remaining p54 files to account for the new file organization.
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54usb.c')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 0e877a104a89..461d88f5ceb7 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -22,6 +22,7 @@ #include <net/mac80211.h> #include "p54.h" +#include "lmac.h" #include "p54usb.h" MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); @@ -961,7 +962,7 @@ err_free_fw: release_firmware(priv->fw); err_free_dev: - ieee80211_free_hw(dev); + p54_free_common(dev); usb_set_intfdata(intf, NULL); usb_put_dev(udev); return err; @@ -975,13 +976,12 @@ static void __devexit p54u_disconnect(struct usb_interface *intf) if (!dev) return; - ieee80211_unregister_hw(dev); + p54_unregister_common(dev); priv = dev->priv; usb_put_dev(interface_to_usbdev(intf)); release_firmware(priv->fw); p54_free_common(dev); - ieee80211_free_hw(dev); } static int p54u_pre_reset(struct usb_interface *intf) |