diff options
| author | Rich Felker <dalias@libc.org> | 2016-06-01 22:21:45 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-07-31 03:33:32 +0000 |
| commit | 03767daa1387f87619404bfe108ebb6aa5826e00 (patch) | |
| tree | 96d098d95c77dea3eaa941cdd4eaecf931955e20 /arch/sh/kernel/setup.c | |
| parent | b46ed37042fa21ce3e888310462902044df98321 (diff) | |
| download | linux-03767daa1387f87619404bfe108ebb6aa5826e00.tar.gz linux-03767daa1387f87619404bfe108ebb6aa5826e00.tar.bz2 linux-03767daa1387f87619404bfe108ebb6aa5826e00.zip | |
sh: fix build regression with CONFIG_OF && !CONFIG_OF_FLATTREE
Such a configuration could only be selected by manually selecting
CONFIG_OF; SH_DEVICE_TREE selects both. The affected code is using the
flat DTB at boot time and thus rightfully should depend on
OF_FLATTREE, not just OF.
Signed-off-by: Rich Felker <dalias@libc.org>
Diffstat (limited to 'arch/sh/kernel/setup.c')
| -rw-r--r-- | arch/sh/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 5b9eb70311e3..e7b49d81053e 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -242,7 +242,7 @@ void __init __weak plat_early_device_setup(void) { } -#ifdef CONFIG_OF +#ifdef CONFIG_OF_FLATTREE void __ref sh_fdt_init(phys_addr_t dt_phys) { static int done = 0; |