| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd | [log] [tgz] |
|---|---|---|
| author | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
| committer | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd [diff] [blame] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/include/api_public.h b/include/api_public.h index 9bc0501..5b0c09e 100644 --- a/include/api_public.h +++ b/include/api_public.h
@@ -126,6 +126,7 @@ #define DT_STOR_SCSI 0x0020 #define DT_STOR_USB 0x0040 #define DT_STOR_MMC 0x0080 +#define DT_STOR_SATA 0x0100 #define DEV_STA_CLOSED 0x0000 /* invalid, closed */ #define DEV_STA_OPEN 0x0001 /* open i.e. active */