diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:16:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:16:46 +0200 |
| commit | a1a2ab2ff7040bdc9a31bfe7173913971f7d723b (patch) | |
| tree | a5b448aaedafafca6974710b7d64074ed964fe24 /include/linux | |
| parent | 00eb4bab69db349c3bdc7e0b0f7e9070dafea58c (diff) | |
| parent | 7379047d5585187d1288486d4627873170d0005a (diff) | |
| download | blackbird-op-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.gz blackbird-op-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.zip | |
Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irqdomain.h | 5 | ||||
| -rw-r--r-- | include/linux/usb/renesas_usbhs.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index d3ca79236fb0..f644fdb06dd6 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -161,6 +161,11 @@ enum { IRQ_DOMAIN_FLAG_NONCORE = (1 << 16), }; +static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d) +{ + return d->of_node; +} + #ifdef CONFIG_IRQ_DOMAIN struct irq_domain *__irq_domain_add(struct device_node *of_node, int size, irq_hw_number_t hwirq_max, int direct_max, diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h index 3dd5a781da99..bfb74723f151 100644 --- a/include/linux/usb/renesas_usbhs.h +++ b/include/linux/usb/renesas_usbhs.h @@ -157,7 +157,7 @@ struct renesas_usbhs_driver_param { */ int pio_dma_border; /* default is 64byte */ - u32 type; + uintptr_t type; u32 enable_gpio; /* |
