pcnet.c: fix a merge issue
authorWolfgang Denk <wd@denx.de>
Mon, 28 Apr 2008 10:48:47 +0000 (12:48 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 28 Apr 2008 10:48:47 +0000 (12:48 +0200)
commitf2c288a35341ad02ac03b1563d786763c9c8f159
tree75819bc39422c6f54f20a7d93b80f7508e3b3429
parent4ca79f477ebd25a6872e6196d80e2f5eff441376
pcnet.c: fix a merge issue

Signed-off-by: Wolfgang Denk <wd@denx.de>
drivers/net/pcnet.c