Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx

[platform/kernel/u-boot.git] / include / api_public.h

diff --git a/include/api_public.h b/include/api_public.h
index 9bc0501..d3164f6 100644 (file)
--- a/include/api_public.h
+++ b/include/api_public.h
@@ -110,8 +110,8 @@ struct sys_info {
        int                     mr_no;  /* number of memory regions */
 };
 
-#undef CFG_64BIT_LBA
-#ifdef CFG_64BIT_LBA
+#undef CONFIG_SYS_64BIT_LBA
+#ifdef CONFIG_SYS_64BIT_LBA
 typedef        u_int64_t lbasize_t;
 #else
 typedef unsigned long lbasize_t;
@@ -126,6 +126,7 @@ typedef unsigned long lbastart_t;
 #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 */