diff options
author | Christian Lamparter <chunkeey@web.de> | 2009-06-23 19:39:45 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 23:02:24 +0400 |
commit | d8c9210757605c5191d2d9f4e09be5e59ceac824 (patch) | |
tree | 45f0b0c76771c40e14ec49807247ea5ec27439f7 /drivers/net/wireless/p54/p54spi.c | |
parent | 0a5fb84f6b62bca8352f0aad045118e47340b096 (diff) | |
download | linux-d8c9210757605c5191d2d9f4e09be5e59ceac824.tar.xz |
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/p54spi.c')
-rw-r--r-- | drivers/net/wireless/p54/p54spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index 83116baeb110..7ef191a9d792 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c @@ -34,7 +34,7 @@ #include "p54spi_eeprom.h" #include "p54.h" -#include "p54common.h" +#include "lmac.h" MODULE_FIRMWARE("3826.arm"); MODULE_ALIAS("stlc45xx"); @@ -713,7 +713,7 @@ static int __devexit p54spi_remove(struct spi_device *spi) { struct p54s_priv *priv = dev_get_drvdata(&spi->dev); - ieee80211_unregister_hw(priv->hw); + p54_unregister_common(priv->hw); free_irq(gpio_to_irq(p54spi_gpio_irq), spi); @@ -724,7 +724,6 @@ static int __devexit p54spi_remove(struct spi_device *spi) mutex_destroy(&priv->mutex); p54_free_common(priv->hw); - ieee80211_free_hw(priv->hw); return 0; } |