diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-07 07:37:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-07 07:37:45 +0200 |
| commit | 37ef1647b7f73d4ff4c7993984599b6c4f26443a (patch) | |
| tree | 95563fd5ba2c8595215616892127cd361a3ce1fd /include | |
| parent | Merge tag 'staging-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | drivers/base: cacheinfo: handle absence of caches (diff) | |
| download | linux-37ef1647b7f73d4ff4c7993984599b6c4f26443a.tar.xz linux-37ef1647b7f73d4ff4c7993984599b6c4f26443a.zip | |
Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are two fixes for the driver core that resolve some reported
issues.
One is a regression from 4.0, the other a fixes a reported oops that
has been there since 3.19.
Both have been in linux-next for a while with no problems"
* tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
drivers/base: cacheinfo: handle absence of caches
drivers: of/base: move of_init to driver_init
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index ddeaae6d2083..b871ff9d81d7 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -121,6 +121,8 @@ extern struct device_node *of_stdout; extern raw_spinlock_t devtree_lock; #ifdef CONFIG_OF +void of_core_init(void); + static inline bool is_of_node(struct fwnode_handle *fwnode) { return fwnode && fwnode->type == FWNODE_OF; @@ -376,6 +378,10 @@ bool of_console_check(struct device_node *dn, char *name, int index); #else /* CONFIG_OF */ +static inline void of_core_init(void) +{ +} + static inline bool is_of_node(struct fwnode_handle *fwnode) { return false; |