diff options
author | Wolfgang Denk <wd@denx.de> | 2008-04-28 12:48:47 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-04-28 12:48:47 +0200 |
commit | f2c288a35341ad02ac03b1563d786763c9c8f159 (patch) | |
tree | 75819bc39422c6f54f20a7d93b80f7508e3b3429 /drivers/misc/ali512x.c | |
parent | 4ca79f477ebd25a6872e6196d80e2f5eff441376 (diff) | |
download | u-boot-imx-f2c288a35341ad02ac03b1563d786763c9c8f159.zip u-boot-imx-f2c288a35341ad02ac03b1563d786763c9c8f159.tar.gz u-boot-imx-f2c288a35341ad02ac03b1563d786763c9c8f159.tar.bz2 |
pcnet.c: fix a merge issue
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/misc/ali512x.c')
0 files changed, 0 insertions, 0 deletions