Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq update from Thomas Gleixner:
"The last update for 4.2 is just moving a macro from a local header to
the global one, so it can be used in architecture code as well.

Cleanup of the now empty local header is 4.3 material"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h

+15 -18
+1 -18
drivers/irqchip/irqchip.h
··· 8 8 * warranty of any kind, whether express or implied. 9 9 */ 10 10 11 - #ifndef _IRQCHIP_H 12 - #define _IRQCHIP_H 13 - 14 - #include <linux/of.h> 15 - 16 - /* 17 - * This macro must be used by the different irqchip drivers to declare 18 - * the association between their DT compatible string and their 19 - * initialization function. 20 - * 21 - * @name: name that must be unique accross all IRQCHIP_DECLARE of the 22 - * same file. 23 - * @compstr: compatible string of the irqchip driver 24 - * @fn: initialization function 25 - */ 26 - #define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn) 27 - 28 - #endif 11 + #include <linux/irqchip.h>
+14
include/linux/irqchip.h
··· 11 11 #ifndef _LINUX_IRQCHIP_H 12 12 #define _LINUX_IRQCHIP_H 13 13 14 + #include <linux/of.h> 15 + 16 + /* 17 + * This macro must be used by the different irqchip drivers to declare 18 + * the association between their DT compatible string and their 19 + * initialization function. 20 + * 21 + * @name: name that must be unique accross all IRQCHIP_DECLARE of the 22 + * same file. 23 + * @compstr: compatible string of the irqchip driver 24 + * @fn: initialization function 25 + */ 26 + #define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn) 27 + 14 28 #ifdef CONFIG_IRQCHIP 15 29 void irqchip_init(void); 16 30 #else