On Wed, Feb 17, 2010 at 04:03:44PM +0100, Florian Fainelli wrote: > > @@ -1006,7 +1006,7 @@ static int __devinit au1000_probe(struct > > platform_device *pdev) db_dest_t *pDB, *pDBfree; > > int irq, i, err = 0; > > struct resource *base, *macen; > > - DECLARE_MAC_BUF(ethaddr); > > + char ethaddr[6]; > > That hunk is already in net-next-2.6. Fortunately this doesn't cause a merge conflict. Ralf
