Merge /spare/repo/linux-2.6/

diff --cc drivers/net/wireless/orinoco.c
index b47684c3217e544f8af8f2e87eb2912c4159de08,b1078baa1d5e3851804b12509222407283b753d2..a57187391f81c5959332b254c56df4a77923f272
--- 1/drivers/net/wireless/orinoco.c
--- 2/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@@ -2265,10 -2278,10 +2279,10 @@@ static int orinoco_init(struct net_devi
  
        /* No need to lock, the hw_unavailable flag is already set in
         * alloc_orinocodev() */
 -      priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
 +      priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;
  
        /* Initialize the firmware */
-       err = hermes_init(hw);
+       err = orinoco_reinit_firmware(dev);
        if (err != 0) {
                printk(KERN_ERR "%s: failed to initialize firmware (err = %d)\n",
                       dev->name, err);