Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 440f39a4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'depends/cleanup' into next/dt

parents 7734a93b f8060f54

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -4216,6 +4216,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
S:	Maintained

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	kernel/irq/

F:	kernel/irq/

F:	drivers/irqchip/





IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/arm/common/Kconfig

+0 −23
Original line number Original line Diff line number Diff line 
config ARM_GIC

	bool

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER



config GIC_NON_BANKED

	bool



config ARM_VIC

	bool

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER



config ARM_VIC_NR

	int

	default 4 if ARCH_S5PV210

	default 3 if ARCH_S5PC100

	default 2

	depends on ARM_VIC

	help

	  The maximum number of VICs available in the system, for

	  power management.



config ICST

config ICST

	bool

	bool

arch/arm/common/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,6 @@ 
# Makefile for the linux kernel.

# Makefile for the linux kernel.

#

#





obj-$(CONFIG_ARM_GIC)		+= gic.o

obj-$(CONFIG_ARM_VIC)		+= vic.o

obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o

obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o

arch/arm/include/asm/mach/arch.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 




struct tag;

struct tag;

struct meminfo;

struct meminfo;

struct sys_timer;

struct pt_regs;

struct pt_regs;

struct smp_operations;

struct smp_operations;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP
@@ -48,7 +47,7 @@ struct machine_desc { 
	void			(*map_io)(void);/* IO mapping function	*/

	void			(*map_io)(void);/* IO mapping function	*/

	void			(*init_early)(void);

	void			(*init_early)(void);

	void			(*init_irq)(void);

	void			(*init_irq)(void);

	struct sys_timer	*timer;		/* system tick timer	*/

	void			(*init_time)(void);

	void			(*init_machine)(void);

	void			(*init_machine)(void);

	void			(*init_late)(void);

	void			(*init_late)(void);

#ifdef CONFIG_MULTI_IRQ_HANDLER

#ifdef CONFIG_MULTI_IRQ_HANDLER

arch/arm/include/asm/mach/irq.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ extern int show_fiq_list(struct seq_file *, int); 




#ifdef CONFIG_MULTI_IRQ_HANDLER

#ifdef CONFIG_MULTI_IRQ_HANDLER

extern void (*handle_arch_irq)(struct pt_regs *);

extern void (*handle_arch_irq)(struct pt_regs *);

extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));

#endif

#endif





/*

/*