Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / sata.h

diff --git a/include/sata.h b/include/sata.h
index fa61da8ddd0431e7e34c12682a27bb7fc3a585ef..d18cc9aa87543453763f76f1cdb48f0e3a660765 100644 (file)
--- a/include/sata.h
+++ b/include/sata.h
@@ -2,6 +2,7 @@
 #define __SATA_H__
 #include <part.h>
 
+#if !defined(CONFIG_DM_SCSI)
 int init_sata(int dev);
 int reset_sata(int dev);
 int scan_sata(int dev);
@@ -14,6 +15,7 @@ int sata_stop(void);
 int __sata_stop(void);
 int sata_port_status(int dev, int port);
 
-extern block_dev_desc_t sata_dev_desc[];
+extern struct blk_desc sata_dev_desc[];
+#endif
 
 #endif