fsl_diu_fb: further refactoring of FSL DIU code

[karo-tx-uboot.git] / include / ide.h

diff --git a/include/ide.h b/include/ide.h
index 222f4f84e48664f25e983b48557cf695c2f883df..6a1b7ae844f34529e6dfa4d18ae7887c9f068ea6 100644 (file)
--- a/include/ide.h
+++ b/include/ide.h
@@ -26,7 +26,7 @@
 
 #define        IDE_BUS(dev)    (dev >> 1)
 
-#define        ATA_CURR_BASE(dev)      (CFG_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
+#define        ATA_CURR_BASE(dev)      (CONFIG_SYS_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
 
 #ifdef CONFIG_IDE_LED
 
@@ -40,7 +40,7 @@
 
 #endif /* CONFIG_IDE_LED */
 
-#ifdef CFG_64BIT_LBA
+#ifdef CONFIG_SYS_64BIT_LBA
 typedef uint64_t lbaint_t;
 #else
 typedef ulong lbaint_t;
@@ -54,4 +54,7 @@ void ide_init(void);
 ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
 ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
 
+#if defined(CONFIG_OF_IDE_FIXUP)
+int ide_device_present(int dev);
+#endif
 #endif /* _IDE_H */