Merge branch 'atmel'

diff --cc drivers/net/wireless/atmel.c
index a3e2352,dbc991a..5e53c52
--- 1/drivers/net/wireless/atmel.c
--- 2/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@@ -1653,11 -1654,9 +1654,8 @@@ void stop_atmel_card(struct net_device 
        unregister_netdev(dev);
        remove_proc_entry("driver/atmel", NULL);
        free_irq(dev->irq, dev);
 -      if (priv->firmware)
 -              kfree(priv->firmware);
 +      kfree(priv->firmware);
-       if (freeres) {
-               /* PCMCIA frees this stuff, so only for PCI */
-               release_region(dev->base_addr, 64);
-         }
+       release_region(dev->base_addr, 32);
        free_netdev(dev);
  }
  
@@@ -2645,10 -2646,10 +2644,10 @@@ static void handle_beacon_probe(struct 
        } 
  }
  
-  
- static void send_authentication_request(struct atmel_private *priv, u8 *challenge, int challenge_len)
+ 
+ static void send_authentication_request(struct atmel_private *priv, u16 system, u8 *challenge, int challenge_len)
  {
 -      struct ieee80211_hdr header;
 +      struct ieee80211_hdr_4addr header;
        struct auth_body auth;
        
        header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH); 

diff --cc drivers/net/wireless/atmel_cs.c
Simple merge