diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 17:38:30 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 17:38:30 -0500 |
| commit | 172ad9af55d236cb124d67de7314a90dedb50df1 (patch) | |
| tree | ab225ebb0bcab867305fec87308bda97ca060102 /include/linux/of.h | |
| parent | a44007a42dfd8e487537c7b1f8045577b28a4d95 (diff) | |
| parent | 18558cae0272f8fd9647e69d3fec1565a7949865 (diff) | |
Merge 4.5-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 2 |
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) | |||
| 929 | return num; | 929 | return num; |
| 930 | } | 930 | } |
| 931 | 931 | ||
| 932 | #ifdef CONFIG_OF | 932 | #if defined(CONFIG_OF) && !defined(MODULE) |
| 933 | #define _OF_DECLARE(table, name, compat, fn, fn_type) \ | 933 | #define _OF_DECLARE(table, name, compat, fn, fn_type) \ |
| 934 | static const struct of_device_id __of_table_##name \ | 934 | static const struct of_device_id __of_table_##name \ |
| 935 | __used __section(__##table##_of_table) \ | 935 | __used __section(__##table##_of_table) \ |