diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/lasat/prom.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/lasat/prom.c')
| -rw-r--r-- | arch/mips/lasat/prom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c index 6acc6cb85f0a..20fde19a5fbf 100644 --- a/arch/mips/lasat/prom.c +++ b/arch/mips/lasat/prom.c | |||
| @@ -100,8 +100,8 @@ void __init prom_init(void) | |||
| 100 | 100 | ||
| 101 | /* Get the command line */ | 101 | /* Get the command line */ |
| 102 | if (argc > 0) { | 102 | if (argc > 0) { |
| 103 | strncpy(arcs_cmdline, argv[0], CL_SIZE-1); | 103 | strncpy(arcs_cmdline, argv[0], COMMAND_LINE_SIZE-1); |
| 104 | arcs_cmdline[CL_SIZE-1] = '\0'; | 104 | arcs_cmdline[COMMAND_LINE_SIZE-1] = '\0'; |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | /* Set the I/O base address */ | 107 | /* Set the I/O base address */ |