summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-03 09:55:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-03 09:55:50 -0800
commit86270c8d7b1e98cd0f1dc107446461c050149b67 (patch)
tree68954a45089e2903e303b5c8b4e93530d9cd9a9b /include
parent81b676bd87b3e098e06295a6dd523c02e7861e88 (diff)
parent71f50c6d9a2276f3ec85384bffe2aee1962f4669 (diff)
downloadlinux-stable-86270c8d7b1e98cd0f1dc107446461c050149b67.tar.gz
linux-stable-86270c8d7b1e98cd0f1dc107446461c050149b67.tar.bz2
linux-stable-86270c8d7b1e98cd0f1dc107446461c050149b67.zip
Merge tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring: - Fix build error with *_OF_DECLARE() when used in modules - Add missing platform maintainers for dts files in MAINTAINERS * tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: of: drop symbols declared by _OF_DECLARE() from modules MAINTAINERS: Add missing platform maintainers for dts files
Diffstat (limited to 'include')
-rw-r--r--include/linux/of.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index dd10626a615f..dc6e39696b64 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -929,7 +929,7 @@ static inline int of_get_available_child_count(const struct device_node *np)
return num;
}
-#ifdef CONFIG_OF
+#if defined(CONFIG_OF) && !defined(MODULE)
#define _OF_DECLARE(table, name, compat, fn, fn_type) \
static const struct of_device_id __of_table_##name \
__used __section(__##table##_of_table) \