diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/mips/sgi-ip22/ip22-setup.c | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-setup.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index b9a931358e23..5deeb68b6c9c 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c | |||
| @@ -67,7 +67,7 @@ void __init plat_mem_setup(void) | |||
| 67 | cserial = ArcGetEnvironmentVariable("ConsoleOut"); | 67 | cserial = ArcGetEnvironmentVariable("ConsoleOut"); |
| 68 | 68 | ||
| 69 | if ((ctype && *ctype == 'd') || (cserial && *cserial == 's')) { | 69 | if ((ctype && *ctype == 'd') || (cserial && *cserial == 's')) { |
| 70 | static char options[8]; | 70 | static char options[8] __initdata; |
| 71 | char *baud = ArcGetEnvironmentVariable("dbaud"); | 71 | char *baud = ArcGetEnvironmentVariable("dbaud"); |
| 72 | if (baud) | 72 | if (baud) |
| 73 | strcpy(options, baud); | 73 | strcpy(options, baud); |