diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
| commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/api_public.h | |
| parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/api_public.h')
| -rw-r--r-- | include/api_public.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/api_public.h b/include/api_public.h index 5b0c09e..d3164f6 100644 --- 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; |