diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-19 16:29:40 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-19 16:29:40 -0700 |
commit | 44dc19c829c057dc78a5ffacaf851ac4c301eb58 (patch) | |
tree | 7da34731e9dfaefaf14f9119158db864b7677a12 /drivers/net/wireless/ipw2200.c | |
parent | 0686caa35ed17cf5b9043f453957e702a7eb588d (diff) | |
parent | 229ce3abb6d6d4598de8ef1ed1e2da8163a9bbc0 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index fa87c5c2ae0..d74c061994a 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -11584,6 +11584,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv) priv->prom_net_dev->hard_start_xmit = ipw_prom_hard_start_xmit; priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; + SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); rc = register_netdev(priv->prom_net_dev); if (rc) { |