Coding Style cleanup; update CHANGELOG, prepare -rc1

[u-boot] / board / davinci / dm355evm / dm355evm.c

diff --git a/board/davinci/dm355evm/dm355evm.c b/board/davinci/dm355evm/dm355evm.c
index 0a44748320f31591e44287e158bc695528e87a6e..87f284c4cea251cb2076824f9e3e2b49b8e644d5 100644 (file)
--- a/board/davinci/dm355evm/dm355evm.c
+++ b/board/davinci/dm355evm/dm355evm.c
@@ -92,8 +92,8 @@ int board_eth_init(bd_t *bis)
 static void nand_dm355evm_select_chip(struct mtd_info *mtd, int chip)
 {
        struct nand_chip        *this = mtd->priv;
-       u32                     wbase = (u32) this->IO_ADDR_W;
-       u32                     rbase = (u32) this->IO_ADDR_R;
+       unsigned long           wbase = (unsigned long) this->IO_ADDR_W;
+       unsigned long           rbase = (unsigned long) this->IO_ADDR_R;
 
        if (chip == 1) {
                __set_bit(14, &wbase);