diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/mips/sni/setup.c | |
parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/mips/sni/setup.c')
-rw-r--r-- | arch/mips/sni/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index a49272ce7ef5..d16b462154c3 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -60,7 +60,7 @@ static void __init sni_console_setup(void) | |||
60 | char *cdev; | 60 | char *cdev; |
61 | char *baud; | 61 | char *baud; |
62 | int port; | 62 | int port; |
63 | static char options[8]; | 63 | static char options[8] __initdata; |
64 | 64 | ||
65 | cdev = prom_getenv("console_dev"); | 65 | cdev = prom_getenv("console_dev"); |
66 | if (strncmp(cdev, "tty", 3) == 0) { | 66 | if (strncmp(cdev, "tty", 3) == 0) { |