Hand-merge typhoon and wavelan_cs conflicts, when

merging viro's ETH* patches.

diff --cc drivers/net/typhoon.c
Simple merge

diff --cc drivers/net/wireless/wavelan_cs.c
index a9691c6d1d3a7783ebd3dad3ecdaeeedf55a0d5e,525d1bbabf3a7ae0227b32838e8e2d08fc871132..0579717b9dfbd2d30d222104ddee1afb38b1b325
--- 1/drivers/net/wireless/wavelan_cs.c
--- 2/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@@ -2742,47 -2721,13 +2727,12 @@@ static const struct iw_handler_def   wave
        .num_standard   = sizeof(wavelan_handler)/sizeof(iw_handler),
        .num_private    = sizeof(wavelan_private_handler)/sizeof(iw_handler),
        .num_private_args = sizeof(wavelan_private_args)/sizeof(struct iw_priv_args),
 -      .standard       = (iw_handler *) wavelan_handler,
 -      .private        = (iw_handler *) wavelan_private_handler,
 -      .private_args   = (struct iw_priv_args *) wavelan_private_args,
 -      .spy_offset     = ((void *) (&((net_local *) NULL)->spy_data) -
 -                         (void *) NULL),
 +      .standard       = wavelan_handler,
 +      .private        = wavelan_private_handler,
 +      .private_args   = wavelan_private_args,
 +      .get_wireless_stats = wavelan_get_wireless_stats,
  };
  
- /*------------------------------------------------------------------*/
- /*
-  * Perform ioctl : config & info stuff
-  * This is here that are treated the wireless extensions (iwconfig)
-  */
- static int
- wavelan_ioctl(struct net_device *     dev,    /* Device on wich the ioctl apply */
-             struct ifreq *    rq,     /* Data passed */
-             int               cmd)    /* Ioctl number */
- {
-   int                 ret = 0;
- 
- #ifdef DEBUG_IOCTL_TRACE
-   printk(KERN_DEBUG "%s: ->wavelan_ioctl(cmd=0x%X)\n", dev->name, cmd);
- #endif
- 
-   /* Look what is the request */
-   switch(cmd)
-     {
-     case SIOCETHTOOL:
-       ret = wl_netdev_ethtool_ioctl(dev, rq->ifr_data);
-       break;
- 
-       /* ------------------- OTHER IOCTL ------------------- */
- 
-     default:
-       ret = -EOPNOTSUPP;
-     }
- 
- #ifdef DEBUG_IOCTL_TRACE
-   printk(KERN_DEBUG "%s: <-wavelan_ioctl()\n", dev->name);
- #endif
-   return ret;
- }
- 
  /*------------------------------------------------------------------*/
  /*
   * Get wireless statistics
@@@ -4722,12 -4667,11 +4672,12 @@@ wavelan_attach(void
    /* Set the watchdog timer */
    dev->tx_timeout     = &wavelan_watchdog;
    dev->watchdog_timeo = WATCHDOG_JIFFIES;
+   SET_ETHTOOL_OPS(dev, &ops);
  
  #ifdef WIRELESS_EXT   /* If wireless extension exist in the kernel */
 -  dev->wireless_handlers = (struct iw_handler_def *)&wavelan_handler_def;
 -  dev->get_wireless_stats = wavelan_get_wireless_stats;
 +  dev->wireless_handlers = &wavelan_handler_def;
-   dev->do_ioctl = wavelan_ioctl;      /* ethtool */
 +  lp->wireless_data.spy_data = &lp->spy_data;
 +  dev->wireless_data = &lp->wireless_data;
  #endif
  
    /* Other specific data */