diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-28 10:54:20 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-28 10:54:20 -0500 |
| commit | aa10537f62f2d508f68195b496d9a9021f5d2eff (patch) | |
| tree | 14a8a16ec61dc5f604c3b8abfc87aa58afe76a5d /include/linux | |
| parent | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (diff) | |
| parent | 08cf78ed41feaa21017487bad0a5a405c6cede43 (diff) | |
Merge tag 'dt-for-robh' of git://git.secretlab.ca/git/linux into for-next
Pull DT changes from Grant Likely:
DT queued up for v3.16
Mostly bug fixes, but also some rework to improve path handling and device naming
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_irq.h | 5 | ||||
| -rw-r--r-- | include/linux/string.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 6404253d810d..bfec136a6d1e 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -45,6 +45,7 @@ extern void of_irq_init(const struct of_device_id *matches); #ifdef CONFIG_OF_IRQ extern int of_irq_count(struct device_node *dev); extern int of_irq_get(struct device_node *dev, int index); +extern int of_irq_get_byname(struct device_node *dev, const char *name); #else static inline int of_irq_count(struct device_node *dev) { @@ -54,6 +55,10 @@ static inline int of_irq_get(struct device_node *dev, int index) { return 0; } +static inline int of_irq_get_byname(struct device_node *dev, const char *name) +{ + return 0; +} #endif #if defined(CONFIG_OF) diff --git a/include/linux/string.h b/include/linux/string.h index ac889c5ea11b..d36977e029af 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -52,6 +52,9 @@ extern int strncasecmp(const char *s1, const char *s2, size_t n); #ifndef __HAVE_ARCH_STRCHR extern char * strchr(const char *,int); #endif +#ifndef __HAVE_ARCH_STRCHRNUL +extern char * strchrnul(const char *,int); +#endif #ifndef __HAVE_ARCH_STRNCHR extern char * strnchr(const char *, size_t, int); #endif |