Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[u-boot] / board / esd / cpci750 / ide.c

diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c
index bea99ce8e721b13e2b33ea04c5179fab75789c48..0adafe2d085ec5fb21eae76dcc784eef05bac04f 100644 (file)
--- a/board/esd/cpci750/ide.c
+++ b/board/esd/cpci750/ide.c
@@ -25,7 +25,7 @@
 
 
 #include <common.h>
-#ifdef CFG_CMD_IDE
+#if defined(CONFIG_CMD_IDE)
 #include <ata.h>
 #include <ide.h>
 #include <pci.h>
@@ -43,6 +43,8 @@ int ide_preinit (void)
                ide_bus_offset[l] = -ATA_STATUS;
        }
        devbusfn = pci_find_device (0x1103, 0x0004, 0);
+       if (devbusfn == -1)
+               devbusfn = pci_find_device (0x1095, 0x3114, 0);
        if (devbusfn != -1) {
                status = 0;