Andy Fleming f38d1008b0
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 >
2008-04-25 02:07:09 -04:00
2008-03-03 14:53:16 -08:00
2008-04-17 10:42:46 -04:00
2008-04-18 11:25:31 -07:00
2008-04-19 18:14:50 -07:00
2008-04-07 12:19:10 -05:00
2008-04-17 23:56:30 -07:00
2008-04-19 18:17:26 -07:00
2008-03-04 11:28:41 +01:00
2008-04-18 08:37:01 -07:00
2008-03-23 21:51:12 -07:00
2008-03-05 14:45:31 -05:00
2008-03-26 00:58:19 -04:00
2008-04-17 07:47:02 +02:00
2008-04-17 13:25:54 -07:00
2008-04-18 17:55:37 +02:00
2008-04-04 14:46:26 -07:00
2008-03-10 18:01:19 -07:00
2008-03-18 11:20:33 +01:00
2008-03-27 08:40:41 -04:00
2008-04-11 12:07:05 +02:00
2008-04-18 00:46:35 +02:00
2008-04-18 17:55:31 +02:00
2008-04-16 21:09:35 -07:00
2008-04-02 10:14:29 -04:00
2008-04-13 22:44:20 -07:00
2008-04-23 03:33:32 -07:00
2008-03-30 14:20:23 -07:00
2008-04-18 00:46:23 +02:00
2008-04-11 08:06:44 -07:00
2008-04-07 19:14:34 -07:00
2008-03-28 14:45:23 -07:00
2008-04-07 12:19:02 -05:00
2008-03-30 14:20:24 -07:00
2008-04-17 20:05:43 +02:00
2008-04-15 19:35:40 -07:00
2008-04-08 18:25:53 -07:00
2008-04-25 02:07:09 -04:00
2008-03-15 19:17:12 -07:00
2008-04-04 14:30:31 -07:00
2008-03-28 14:45:22 -07:00
2008-04-15 19:35:40 -07:00
2008-03-26 14:22:20 -04:00
2008-03-03 10:47:13 -08:00
2008-04-15 19:35:40 -07:00
2008-04-18 18:02:35 -07:00
2008-04-18 11:25:31 -07:00
2008-04-17 20:05:42 +02:00
2008-03-17 08:11:48 -04:00
2008-04-15 19:35:41 -07:00
2008-04-23 21:25:35 -04:00
2008-04-15 19:35:41 -07:00
2008-03-24 22:33:49 -07:00
2008-04-15 22:30:53 -07:00
2008-04-15 19:35:40 -07:00
2008-04-07 13:14:22 -07:00
2008-03-04 16:35:12 -08:00
2008-04-11 08:06:44 -07:00
2008-04-04 18:36:46 +02:00
f38d1008b0