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 /board/socrates/nand.c | |
parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
download | talos-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz talos-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/socrates/nand.c')
-rw-r--r-- | board/socrates/nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/socrates/nand.c b/board/socrates/nand.c index 6ec53f872d..7d76f42222 100644 --- a/board/socrates/nand.c +++ b/board/socrates/nand.c @@ -23,7 +23,7 @@ #include <common.h> -#if defined(CFG_NAND_BASE) +#if defined(CONFIG_SYS_NAND_BASE) #include <nand.h> #include <asm/errno.h> #include <asm/io.h> |