ucc_geth: Fix merge error.
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 23:21:16 +0000 (16:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 23:21:16 +0000 (16:21 -0700)
I left a merge failure unresolved, noticed by Stephen
Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

No differences found