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/sgi-ip32/ip32-setup.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/sgi-ip32/ip32-setup.c')
| -rw-r--r-- | arch/mips/sgi-ip32/ip32-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c index c5a5d4a31b4b..3abd1465ec02 100644 --- a/arch/mips/sgi-ip32/ip32-setup.c +++ b/arch/mips/sgi-ip32/ip32-setup.c | |||
| @@ -90,7 +90,7 @@ void __init plat_mem_setup(void) | |||
| 90 | { | 90 | { |
| 91 | char* con = ArcGetEnvironmentVariable("console"); | 91 | char* con = ArcGetEnvironmentVariable("console"); |
| 92 | if (con && *con == 'd') { | 92 | if (con && *con == 'd') { |
| 93 | static char options[8]; | 93 | static char options[8] __initdata; |
| 94 | char *baud = ArcGetEnvironmentVariable("dbaud"); | 94 | char *baud = ArcGetEnvironmentVariable("dbaud"); |
| 95 | if (baud) | 95 | if (baud) |
| 96 | strcpy(options, baud); | 96 | strcpy(options, baud); |