Merge tag 'ntb-3.12' of git://github.com/jonmason/ntb

[~andy/linux] / arch / arm / mach-kirkwood / rd88f6281-setup.c

diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index d24223166e06c60e5d9631d6f8818f44bfb0fc5b..5154bd2a3ad3d581d727f946f08e83378d7e80a9 100644 (file)
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -87,7 +87,9 @@ static void __init rd88f6281_init(void)
        kirkwood_init();
        kirkwood_mpp_conf(rd88f6281_mpp_config);
 
-       kirkwood_nand_init(ARRAY_AND_SIZE(rd88f6281_nand_parts), 25);
+       kirkwood_nand_init(rd88f6281_nand_parts,
+                          ARRAY_SIZE(rd88f6281_nand_parts),
+                          25);
        kirkwood_ehci_init();
 
        kirkwood_ge00_init(&rd88f6281_ge00_data);