diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 09:34:38 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 09:35:36 -0400 |
| commit | db985cbd67c45f875ef43cb5febfaa8cbd203c27 (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /include/linux/component.h | |
| parent | c6f1224573c3b609bd8073b39f496637a16cc06f (diff) | |
| parent | 468a903c0e5147e3f93187f0b808a3ef957fd00e (diff) | |
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
- keystone: add new driver
- hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
- gic: Use defines instead of magic number, preserve v2 bybass bits
- handle_domain_irq: common low level interrupt entry handler
Diffstat (limited to 'include/linux/component.h')
| -rw-r--r-- | include/linux/component.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/component.h b/include/linux/component.h index 68870182ca1e..c00dcc302611 100644 --- a/include/linux/component.h +++ b/include/linux/component.h | |||
| @@ -29,4 +29,11 @@ void component_master_del(struct device *, | |||
| 29 | int component_master_add_child(struct master *master, | 29 | int component_master_add_child(struct master *master, |
| 30 | int (*compare)(struct device *, void *), void *compare_data); | 30 | int (*compare)(struct device *, void *), void *compare_data); |
| 31 | 31 | ||
| 32 | struct component_match; | ||
| 33 | |||
| 34 | int component_master_add_with_match(struct device *, | ||
| 35 | const struct component_master_ops *, struct component_match *); | ||
| 36 | void component_match_add(struct device *, struct component_match **, | ||
| 37 | int (*compare)(struct device *, void *), void *compare_data); | ||
| 38 | |||
| 32 | #endif | 39 | #endif |
