Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / net / ethernet / 3com / 3c59x.c

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 7d7d3ff..7b0ae9e 100644 (file)
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1052,7 +1052,7 @@ static const struct net_device_ops boomrang_netdev_ops = {
        .ndo_tx_timeout         = vortex_tx_timeout,
        .ndo_get_stats          = vortex_get_stats,
 #ifdef CONFIG_PCI
-       .ndo_do_ioctl           = vortex_ioctl,
+       .ndo_eth_ioctl          = vortex_ioctl,
 #endif
        .ndo_set_rx_mode        = set_rx_mode,
        .ndo_set_mac_address    = eth_mac_addr,
@@ -1069,7 +1069,7 @@ static const struct net_device_ops vortex_netdev_ops = {
        .ndo_tx_timeout         = vortex_tx_timeout,
        .ndo_get_stats          = vortex_get_stats,
 #ifdef CONFIG_PCI
-       .ndo_do_ioctl           = vortex_ioctl,
+       .ndo_eth_ioctl          = vortex_ioctl,
 #endif
        .ndo_set_rx_mode        = set_rx_mode,
        .ndo_set_mac_address    = eth_mac_addr,
@@ -2786,7 +2786,7 @@ static void
 dump_tx_ring(struct net_device *dev)
 {
        if (vortex_debug > 0) {
-       struct vortex_private *vp = netdev_priv(dev);
+               struct vortex_private *vp = netdev_priv(dev);
                void __iomem *ioaddr = vp->ioaddr;
 
                if (vp->full_bus_master_tx) {