diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 11:18:16 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 11:18:16 +0300 |
| commit | 6af597de62a365dfec6021b9796aa302044e7cc3 (patch) | |
| tree | 23e365cc4a4e6dff940f5acbb466edbe28160d68 /include/linux | |
| parent | 558a65bc31a0c7811b34dad32f51f47c55a40000 (diff) | |
| parent | 5aa5050787f449e7eaef2c5ec93c7b357aa7dcdc (diff) | |
| download | linux-6af597de62a365dfec6021b9796aa302044e7cc3.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts
Conflicts:
kernel/sched/fair.c
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; /* |