diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/sc3/sc3nand.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/sc3/sc3nand.c')
| -rw-r--r-- | board/sc3/sc3nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/sc3/sc3nand.c b/board/sc3/sc3nand.c index 45eff28c0a..62b40f1675 100644 --- a/board/sc3/sc3nand.c +++ b/board/sc3/sc3nand.c @@ -77,7 +77,7 @@ int board_nand_init(struct nand_chip *nand) { nand->ecc.mode = NAND_ECC_SOFT; - sc3_io_base = (void *) CFG_NAND_BASE; + sc3_io_base = (void *) CONFIG_SYS_NAND_BASE; /* Set address of NAND IO lines (Using Linear Data Access Region) */ nand->IO_ADDR_R = (void __iomem *) sc3_io_base; nand->IO_ADDR_W = (void __iomem *) sc3_io_base; |