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

[karo-tx-uboot.git] / include / api_public.h

diff --git a/include/api_public.h b/include/api_public.h
index 5b0c09e3108a1a063c786b53a4df4f2e8b241799..5940d81fdb019d35c236d4656bc202fc9535b353 100644 (file)
--- a/include/api_public.h
+++ b/include/api_public.h
@@ -57,6 +57,7 @@
 #define API_ENOMEM             3       /* no memory            */
 #define API_EBUSY              4       /* busy, occupied etc.  */
 #define API_EIO                        5       /* I/O error            */
+#define API_ESYSC              6       /* syscall error        */
 
 typedef        int (*scp_t)(int, int *, ...);
 
@@ -110,8 +111,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;