diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-04-23 21:56:17 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-25 06:07:09 (GMT) |
| commit | f38d1008b034e39397d3da67919e220c851db75e (patch) | |
| tree | fa41a70b14e94cd0dda45851aa15a8472f4776ba /drivers/net/ni52.h | |
| parent | 2db3e47e7080fde2a43d6312190d8229826b8e42 (diff) | |
| download | linux-f38d1008b034e39397d3da67919e220c851db75e.tar.xz | |
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>
Diffstat (limited to 'drivers/net/ni52.h')
0 files changed, 0 insertions, 0 deletions