diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /include/asm-mips/bootinfo.h | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-mips/bootinfo.h')
| -rw-r--r-- | include/asm-mips/bootinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index c7c945baf1ee..dbf834f4dac4 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h | |||
| @@ -254,7 +254,7 @@ extern void free_init_pages(const char *what, | |||
| 254 | extern char arcs_cmdline[CL_SIZE]; | 254 | extern char arcs_cmdline[CL_SIZE]; |
| 255 | 255 | ||
| 256 | /* | 256 | /* |
| 257 | * Registers a0, a1, a3 and a4 as passed to the kenrel entry by firmware | 257 | * Registers a0, a1, a3 and a4 as passed to the kernel entry by firmware |
| 258 | */ | 258 | */ |
| 259 | extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; | 259 | extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; |
| 260 | 260 | ||