summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-01-09 13:51:32 -0600
committerWolfgang Denk <wd@denx.de>2008-01-09 23:13:00 +0100
commit02df4a270f817ef6ec39047a01b55fecdc5f3b37 (patch)
tree52c2d6090912b294ec20cc7d724c7269bde8ff9c /include/asm-ppc
parent6636b62a6efc7f14e6e788788631ae7a7fca4537 (diff)
downloadu-boot-imx-02df4a270f817ef6ec39047a01b55fecdc5f3b37.zip
u-boot-imx-02df4a270f817ef6ec39047a01b55fecdc5f3b37.tar.gz
u-boot-imx-02df4a270f817ef6ec39047a01b55fecdc5f3b37.tar.bz2
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 'include/asm-ppc')
0 files changed, 0 insertions, 0 deletions