diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ax88796.c | 4 | ||||
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_usb.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index d19874bf0706..1d882360b34d 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c @@ -459,7 +459,7 @@ static int ax_open(struct net_device *dev) struct ei_device *ei_local = netdev_priv(dev); int ret; - dev_dbg(ax->dev, "%s: open\n", dev->name); + dev_dbg(&ax->dev->dev, "%s: open\n", dev->name); ret = request_irq(dev->irq, ax_ei_interrupt, 0, dev->name, dev); if (ret) @@ -492,7 +492,7 @@ static int ax_close(struct net_device *dev) struct ax_device *ax = to_ax_dev(dev); struct ei_device *ei_local = netdev_priv(dev); - dev_dbg(ax->dev, "%s: close\n", dev->name); + dev_dbg(&ax->dev->dev, "%s: close\n", dev->name); /* turn the phy off */ diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 7dcd138b0fed..f87d76981ab7 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -1274,7 +1274,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, if (pdev->vendor == 0x1282 && pdev->device == 0x9100) { /* Read Chip revision */ - if (pdev->revision < 0x02000030) + if (pdev->revision < 0x30) { printk(KERN_ERR PFX "skipping early DM9100 with Crc bug (use dmfe)\n"); return -ENODEV; diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c index 740a2194fdde..ca24299a26c6 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c @@ -15,7 +15,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/unaligned.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/module.h> @@ -26,6 +25,7 @@ #include <linux/usb.h> #include <linux/workqueue.h> #include <net/ieee80211.h> +#include <asm/unaligned.h> #include "zd_def.h" #include "zd_netdev.h" |