summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54spi.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-22 20:18:40 +0200
committerDavid S. Miller <davem@davemloft.net>2009-07-22 20:18:40 +0200
commitd14a7679ae9b7d4eb4b92e81f5039b719fd98c4d (patch)
treecb12e313178092e92136704660d68f7ce6578d19 /drivers/net/wireless/p54/p54spi.c
parentnet: KS8851 needs to depend on MII (diff)
parentlibertas: Fix problem with broken V4 firmware on CF8381 (diff)
downloadlinux-d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d.tar.xz
linux-d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to '')
-rw-r--r--drivers/net/wireless/p54/p54spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 83116baeb110..72c7dbd39d0a 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -635,7 +635,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
hw = p54_init_common(sizeof(*priv));
if (!hw) {
- dev_err(&priv->spi->dev, "could not alloc ieee80211_hw");
+ dev_err(&spi->dev, "could not alloc ieee80211_hw");
return -ENOMEM;
}