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/sc3/sc3nand.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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 45eff28c0..62b40f167 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; |