diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-14 13:42:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-14 13:42:17 -0500 |
| commit | d8ec5a5d4c63e308beb20b09a05bb8ea3093bedb (patch) | |
| tree | 9da95c789ca01831a546c9caa1db64d3521569ad /drivers/net/wireless/prism54/islpci_dev.c | |
| parent | 6115c11fe1a5a636ac99fc823b00df4ff3c0674e (diff) | |
| parent | 8e3ffa471091c560deb6738ed9ab7445b7a5fd04 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/prism54/islpci_dev.c')
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 41a16d30c79..e05d9b4c831 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -811,6 +811,10 @@ static const struct net_device_ops islpci_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; +static struct device_type wlan_type = { + .name = "wlan", +}; + struct net_device * islpci_setup(struct pci_dev *pdev) { @@ -821,9 +825,8 @@ islpci_setup(struct pci_dev *pdev) return ndev; pci_set_drvdata(pdev, ndev); -#if defined(SET_NETDEV_DEV) SET_NETDEV_DEV(ndev, &pdev->dev); -#endif + SET_NETDEV_DEVTYPE(ndev, &wlan_type); /* setup the structure members */ ndev->base_addr = pci_resource_start(pdev, 0); |