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 /post/lib_ppc/asm.S | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'post/lib_ppc/asm.S')
| -rw-r--r-- | post/lib_ppc/asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/post/lib_ppc/asm.S b/post/lib_ppc/asm.S index 6220ed2bb1b..f6b329aa4df 100644 --- a/post/lib_ppc/asm.S +++ b/post/lib_ppc/asm.S @@ -27,7 +27,7 @@ #include <ppc_defs.h> #include <asm/cache.h> -#if CONFIG_POST & CFG_POST_CPU +#if CONFIG_POST & CONFIG_SYS_POST_CPU /* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */ .global cpu_post_exec_02 |