diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-04-28 11:44:12 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-04-28 16:17:56 -0500 |
| commit | 5d4dd65b1e98ff640c3bdb546a169e397805831e (patch) | |
| tree | 31277c7b2666c081ed0c4b83e0bb150d246c5abb /drivers/of | |
| parent | 81d0848fc8d2058c4cc645d971435c889869433b (diff) | |
| download | linux-5d4dd65b1e98ff640c3bdb546a169e397805831e.tar.bz2 | |
of: fix unittest build without CONFIG_OF_OVERLAY
We get a link error when the new tests are used by overlays
are not:
drivers/of/built-in.o: In function `unflatten_device_tree':
(.init.text+0x967): undefined reference to `unittest_unflatten_overlay_base'
This makes the #ifdef check match the symbols that lead to building
the unittest_unflatten_overlay_base function.
Fixes: 81d0848fc8d2 ("of: Add unit tests for applying overlays")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Tested-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index de5c604f5cc4..4ebb0149d118 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -55,7 +55,7 @@ static inline int of_property_notify(int action, struct device_node *np, } #endif /* CONFIG_OF_DYNAMIC */ -#ifdef CONFIG_OF_UNITTEST +#if defined(CONFIG_OF_UNITTEST) && defined(CONFIG_OF_OVERLAY) extern void __init unittest_unflatten_overlay_base(void); #else static inline void unittest_unflatten_overlay_base(void) {}; |