diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:17:48 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:17:48 +0100 |
commit | 15e7f8b92aed71819411025279cd3df37f8c636b (patch) | |
tree | 6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /arch/mips/sni/setup.c | |
parent | 21949f00a022e090a7e8bc9a01dfca88273c6146 (diff) | |
parent | ef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff) |
Merge branch 'fix/hda' into topic/hda
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) char *cdev; char *baud; int port; - static char options[8]; + static char options[8] __initdata; cdev = prom_getenv("console_dev"); if (strncmp(cdev, "tty", 3) == 0) { |