Merge branch 'fix/hda' into for-linus

[sfrench/cifs-2.6.git] / arch / mips / rb532 / prom.c

diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
index ad5bd10979740673806c5e8b4620dcd6310e039d..d7c26d00cfefe3fdca84fda3fe61bddacc7e799c 100644 (file)
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -69,7 +69,7 @@ static inline unsigned long tag2ul(char *arg, const char *tag)
 
 void __init prom_setup_cmdline(void)
 {
-       static char cmd_line[CL_SIZE] __initdata;
+       static char cmd_line[COMMAND_LINE_SIZE] __initdata;
        char *cp, *board;
        int prom_argc;
        char **prom_argv, **prom_envp;
@@ -115,7 +115,7 @@ void __init prom_setup_cmdline(void)
                strcpy(cp, arcs_cmdline);
                cp += strlen(arcs_cmdline);
        }
-       cmd_line[CL_SIZE-1] = '\0';
+       cmd_line[COMMAND_LINE_SIZE - 1] = '\0';
 
        strcpy(arcs_cmdline, cmd_line);
 }