diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-04 10:08:52 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-04 10:08:52 +1000 |
commit | b79dc6a0981129fe021df178ced8ada1ffd40cfd (patch) | |
tree | 44885c976366a795dd297a48e7b690a349c8ec94 /arch/mips/kernel/setup.c | |
parent | 2f44060779fcaedbfe23c3890e8bd3cc43f1a0cc (diff) | |
parent | 4a89cf810130fde41e3fc729e770cb1a5a87d245 (diff) | |
download | linux-next-b79dc6a0981129fe021df178ced8ada1ffd40cfd.tar.gz |
Merge remote-tracking branch 'mips/mips-for-linux-next'
Diffstat (limited to 'arch/mips/kernel/setup.c')
-rw-r--r-- | arch/mips/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index ef408a03e818..36cf8d65c47d 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -875,6 +875,10 @@ void __init setup_arch(char **cmdline_p) unsigned long kernelsp[NR_CPUS]; unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; +#ifdef CONFIG_USE_OF +unsigned long fw_passed_dtb; +#endif + #ifdef CONFIG_DEBUG_FS struct dentry *mips_debugfs_dir; static int __init debugfs_mips(void) |