diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 12:53:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 12:53:09 +1000 |
| commit | 9e469064d6bf1f8c33fa8ddbd5896ecd14d44819 (patch) | |
| tree | a63cea3e6fd0ddae5be78f01af738d8b2ac2fed6 /include/linux | |
| parent | 5b3487b4ff93bc073f3939919b93c02fa6817e2c (diff) | |
| parent | cfda05c1ddb8b375562b54dc86276cdc42d48297 (diff) | |
| download | linux-next-9e469064d6bf1f8c33fa8ddbd5896ecd14d44819.tar.gz linux-next-9e469064d6bf1f8c33fa8ddbd5896ecd14d44819.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index f0a5d6b10c5a..d74fd82a6963 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -207,7 +207,7 @@ static inline void of_node_clear_flag(struct device_node *n, unsigned long flag) } #if defined(CONFIG_OF_DYNAMIC) || defined(CONFIG_SPARC) -static inline int of_property_check_flag(struct property *p, unsigned long flag) +static inline int of_property_check_flag(const struct property *p, unsigned long flag) { return test_bit(flag, &p->_flags); } @@ -814,7 +814,8 @@ static inline void of_node_clear_flag(struct device_node *n, unsigned long flag) { } -static inline int of_property_check_flag(struct property *p, unsigned long flag) +static inline int of_property_check_flag(const struct property *p, + unsigned long flag) { return 0; } |