Merge branch 'master' of git://git.denx.de/u-boot-nds32

* 'master' of git://git.denx.de/u-boot-nds32:
  nds32/lib: add ide generic support
  nds32: enhance io.h for compatibility with periphals
  ftide020: fix incorrect information display format
This commit is contained in:
Wolfgang Denk
2011-11-21 22:02:35 +01:00
3 changed files with 25 additions and 3 deletions

View File

@@ -316,10 +316,9 @@ int ide_preinit(void)
/* auto-detect IDE controller */
if (ftide_controller_probe()) {
printf("Faraday %s driver version %s\n", FTIDE_IP_NAME,
FTIDE_DRIVER_VERSION);
printf("FTIDE020_S\n");
} else {
printf("Faraday ATA controller not found.\n");
printf("FTIDE020_S ATA controller not found.\n");
return API_ENODEV;
}