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

Commit 9e47b8bf authored Jan 07, 2013 by Rob Herring

irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h



Now that we have VIC moved to drivers/irqchip and all VIC DT init for
platforms using irqchip_init, move gic.h and update the remaining
includes.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-samsung-soc@vger.kernel.org

parent cdbac5bb

arch/arm/mach-ep93xx/core.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@
	#include <linux/i2c-gpio.h>		#include <linux/i2c-gpio.h>
	#include <linux/spi/spi.h>		#include <linux/spi/spi.h>
	#include <linux/export.h>		#include <linux/export.h>
			#include <linux/irqchip/arm-vic.h>

	#include <mach/hardware.h>		#include <mach/hardware.h>
	#include <linux/platform_data/video-ep93xx.h>		#include <linux/platform_data/video-ep93xx.h>
	@@ -44,8 +45,6 @@
	#include <asm/mach/map.h>		#include <asm/mach/map.h>
	#include <asm/mach/time.h>		#include <asm/mach/time.h>

	#include <asm/hardware/vic.h>

	#include "soc.h"		#include "soc.h"

	/*************************************************************************		/*************************************************************************

arch/arm/mach-netx/generic.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,9 @@
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/io.h>		#include <linux/io.h>
			#include <linux/irqchip/arm-vic.h>
	#include <mach/hardware.h>		#include <mach/hardware.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>
	#include <asm/hardware/vic.h>
	#include <mach/netx-regs.h>		#include <mach/netx-regs.h>
	#include <asm/mach/irq.h>		#include <asm/mach/irq.h>

arch/arm/mach-nomadik/cpu-8815.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,13 +25,13 @@
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/irq.h>		#include <linux/irq.h>
	#include <linux/dma-mapping.h>		#include <linux/dma-mapping.h>
			#include <linux/irqchip/arm-vic.h>
	#include <linux/platform_data/clk-nomadik.h>		#include <linux/platform_data/clk-nomadik.h>
	#include <linux/platform_data/pinctrl-nomadik.h>		#include <linux/platform_data/pinctrl-nomadik.h>

	#include <mach/hardware.h>		#include <mach/hardware.h>
	#include <mach/irqs.h>		#include <mach/irqs.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>
	#include <asm/hardware/vic.h>

	#include <asm/cacheflush.h>		#include <asm/cacheflush.h>
	#include <asm/hardware/cache-l2x0.h>		#include <asm/hardware/cache-l2x0.h>

arch/arm/mach-s3c64xx/common.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,10 +25,10 @@
	#include <linux/dma-mapping.h>		#include <linux/dma-mapping.h>
	#include <linux/irq.h>		#include <linux/irq.h>
	#include <linux/gpio.h>		#include <linux/gpio.h>
			#include <linux/irqchip/arm-vic.h>

	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>
	#include <asm/hardware/vic.h>
	#include <asm/system_misc.h>		#include <asm/system_misc.h>

	#include <mach/map.h>		#include <mach/map.h>

arch/arm/mach-s3c64xx/include/mach/regs-irq.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,5 @@
	#ifndef __ASM_ARCH_REGS_IRQ_H		#ifndef __ASM_ARCH_REGS_IRQ_H
	#define __ASM_ARCH_REGS_IRQ_H __FILE__		#define __ASM_ARCH_REGS_IRQ_H __FILE__

	#include <asm/hardware/vic.h>

	#endif /* __ASM_ARCH_6400_REGS_IRQ_H */		#endif /* __ASM_ARCH_6400_REGS_IRQ_H */