From: Andy Fleming <afleming@freescale.com>
Date: Wed, 23 Apr 2008 21:56:17 +0000 (-0500)
Subject: ucc_geth: Fix sneaky merge conflict regarding bus_id
X-Git-Tag: v2.6.26-rc1~1067^2~1^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f38d1008b034e39397d3da67919e220c851db75e;p=pandora-kernel.git

ucc_geth: Fix sneaky merge conflict regarding bus_id

The patch that changed mdio_bus to a string didn't conflict strongly enough
with the patch that added fixed PHY support to UCC.  Gather it back into
the fold.

Fixes this error:
...
 CC      drivers/net/ucc_geth.o
 'ucc_geth_probe':
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/ucc_geth.c:3935: error:
 incompatible types in assignment
 make[3]: *** [drivers/net/ucc_geth.o] Error 1

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

Reading git-diff-tree failed