git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
sibyte
/
common
/
cfe.c
diff --git
a/arch/mips/sibyte/common/cfe.c
b/arch/mips/sibyte/common/cfe.c
index
eb5396c
..
6343011
100644
(file)
--- a/
arch/mips/sibyte/common/cfe.c
+++ b/
arch/mips/sibyte/common/cfe.c
@@
-287,7
+287,7
@@
void __init prom_init(void)
* boot console
*/
cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
* boot console
*/
cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
- if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, C
L
_SIZE) < 0) {
+ if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, C
OMMAND_LINE
_SIZE) < 0) {
if (argc >= 0) {
/* The loader should have set the command line */
/* too early for panic to do any good */
if (argc >= 0) {
/* The loader should have set the command line */
/* too early for panic to do any good */
@@
-318,7
+318,7
@@
void __init prom_init(void)
#endif /* CONFIG_BLK_DEV_INITRD */
/* Not sure this is needed, but it's the safe way. */
#endif /* CONFIG_BLK_DEV_INITRD */
/* Not sure this is needed, but it's the safe way. */
- arcs_cmdline[C
L
_SIZE-1] = 0;
+ arcs_cmdline[C
OMMAND_LINE
_SIZE-1] = 0;
prom_meminit();
prom_meminit();