projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-sh
[platform/kernel/u-boot.git]
/
include
/
sata.h
diff --git
a/include/sata.h
b/include/sata.h
index
fa61da8
..
d89f7a8
100644
(file)
--- a/
include/sata.h
+++ b/
include/sata.h
@@
-2,6
+2,7
@@
#define __SATA_H__
#include <part.h>
#define __SATA_H__
#include <part.h>
+#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
int init_sata(int dev);
int reset_sata(int dev);
int scan_sata(int dev);
int init_sata(int dev);
int reset_sata(int dev);
int scan_sata(int dev);
@@
-14,6
+15,10
@@
int sata_stop(void);
int __sata_stop(void);
int sata_port_status(int dev, int port);
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
+
+int sata_probe(int devnum);
+int sata_remove(int devnum);
#endif
#endif