diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/api_public.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.bz2 | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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; |