diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-01-09 13:51:32 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 23:13:00 +0100 |
| commit | 02df4a270f817ef6ec39047a01b55fecdc5f3b37 (patch) | |
| tree | 52c2d6090912b294ec20cc7d724c7269bde8ff9c /lib_i386/bios_setup.c | |
| parent | 6636b62a6efc7f14e6e788788631ae7a7fca4537 (diff) | |
| download | u-boot-02df4a270f817ef6ec39047a01b55fecdc5f3b37.tar.gz u-boot-02df4a270f817ef6ec39047a01b55fecdc5f3b37.tar.xz u-boot-02df4a270f817ef6ec39047a01b55fecdc5f3b37.zip | |
Fix my own merge stupidity
Way back in August I merged Heiko's patch:
566a494f592: [PCS440EP] upgrade the PCS440EP board
with Jon's CONFIG_COMMANDS patches.
This was done in commit: 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78
However, in the process, I left out some of Heiko's good changes.
Now Heiko's and Jon's patches are properly merged in fat_register_device()
Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'lib_i386/bios_setup.c')
0 files changed, 0 insertions, 0 deletions