diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
| commit | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch) | |
| tree | dde815788aaea3e336aaaf24763311ce63a22e1b /arch/mips/bcm47xx/prom.c | |
| parent | 75639e7ee1401b3876c7a00ffe96ea8027668690 (diff) | |
| parent | d6797322231af98b9bb4afb175dd614cf511e5f7 (diff) | |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'arch/mips/bcm47xx/prom.c')
| -rw-r--r-- | arch/mips/bcm47xx/prom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c index 079e33d52783..fb284c3b2cff 100644 --- a/arch/mips/bcm47xx/prom.c +++ b/arch/mips/bcm47xx/prom.c | |||
| @@ -100,7 +100,7 @@ static __init void prom_init_console(void) | |||
| 100 | 100 | ||
| 101 | static __init void prom_init_cmdline(void) | 101 | static __init void prom_init_cmdline(void) |
| 102 | { | 102 | { |
| 103 | char buf[CL_SIZE]; | 103 | static char buf[CL_SIZE] __initdata; |
| 104 | 104 | ||
| 105 | /* Get the kernel command line from CFE */ | 105 | /* Get the kernel command line from CFE */ |
| 106 | if (cfe_getenv("LINUX_CMDLINE", buf, CL_SIZE) >= 0) { | 106 | if (cfe_getenv("LINUX_CMDLINE", buf, CL_SIZE) >= 0) { |