From: David S. Miller <davem@davemloft.net>
Date: Fri, 31 Oct 2008 07:17:34 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~931
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a1744d3bee19d3b9cbfb825ab316a101b9c9f109;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/p54/p54common.c
---

a1744d3bee19d3b9cbfb825ab316a101b9c9f109
diff --cc drivers/net/arm/at91_ether.c
index 65ce451ae96,6f431a887e7..e21dc2075ed
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@@ -1078,10 -1080,11 +1078,11 @@@ static int __init at91ether_setup(unsig
  		init_timer(&lp->check_timer);
  		lp->check_timer.data = (unsigned long)dev;
  		lp->check_timer.function = at91ether_check_link;
- 	}
+ 	} else if (lp->board_data.phy_irq_pin >= 32)
+ 		gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
  
  	/* Display ethernet banner */
 -	printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
 +	printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%pM)\n",
  	       dev->name, (uint) dev->base_addr, dev->irq,
  	       at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
  	       at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
diff --cc drivers/net/tulip/dmfe.c
index 194f1825718,c91852f49a4..0ec3281529f
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@@ -468,9 -473,10 +472,9 @@@ static int __devinit dmfe_init_one (str
  
  	err = register_netdev (dev);
  	if (err)
- 		goto err_out_res;
+ 		goto err_out_free_buf;
  
 -	printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
 -	       "%s, irq %d.\n",
 +	printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n",
  	       dev->name,
  	       ent->driver_data >> 16,
  	       pci_name(pdev),
diff --cc drivers/net/wireless/p54/p54common.c
index 72859decd90,827ca0384a4..6370c44c64d
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@@ -319,7 -319,8 +319,7 @@@ static int p54_parse_eeprom(struct ieee
  	void *tmp;
  	int err;
  	u8 *end = (u8 *)eeprom + len;
- 	u16 synth;
+ 	u16 synth = 0;
 -	DECLARE_MAC_BUF(mac);
  
  	wrap = (struct eeprom_pda_wrap *) eeprom;
  	entry = (void *)wrap->data + le16_to_cpu(wrap->len);