summaryrefslogtreecommitdiff
path: root/include/sata.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-12-09 07:56:54 -0500
committerTom Rini <trini@konsulko.com>2016-12-09 07:56:54 -0500
commit361a879902a3cbdb692149a1ac580e3199e771ba (patch)
tree22d8f65bdf2e41096d13f2bfd458fb25b3c3698d /include/sata.h
parent3edc0c252257e4afed163a3a74aba24a5509b198 (diff)
Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"
This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing changes made to bb135a0180c31fbd7456021fb9700b49bba7f533.
Diffstat (limited to 'include/sata.h')
-rw-r--r--include/sata.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sata.h b/include/sata.h
index d18cc9aa87..b35359aa5a 100644
--- a/include/sata.h
+++ b/include/sata.h
@@ -2,7 +2,6 @@
#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);
@@ -16,6 +15,5 @@ int __sata_stop(void);
int sata_port_status(int dev, int port);
extern struct blk_desc sata_dev_desc[];
-#endif
#endif