diff options
| -rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-spear/Makefile | 2 | ||||
| -rw-r--r-- | drivers/irqchip/Makefile | 3 | ||||
| -rw-r--r-- | drivers/irqchip/spear-shirq.c (renamed from arch/arm/plat-spear/shirq.c) | 9 | ||||
| -rw-r--r-- | include/linux/irqchip/spear-shirq.h (renamed from arch/arm/plat-spear/include/plat/shirq.h) | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index f1aaf5b168b2..38fe95db31a7 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -15,12 +15,12 @@ #include <linux/amba/pl022.h> #include <linux/amba/pl08x.h> +#include <linux/irqchip/spear-shirq.h> #include <linux/of_irq.h> #include <linux/io.h> #include <asm/hardware/pl080.h> #include <asm/hardware/vic.h> #include <plat/pl080.h> -#include <plat/shirq.h> #include <mach/generic.h> #include <mach/spear.h> diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile index 2607bd05c525..01e88532a5db 100644 --- a/arch/arm/plat-spear/Makefile +++ b/arch/arm/plat-spear/Makefile @@ -5,5 +5,5 @@ # Common support obj-y := restart.o time.o -obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o shirq.o +obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o obj-$(CONFIG_ARCH_SPEAR6XX) += pl080.o diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 054321db4350..bf7b43696cdb 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -1 +1,2 @@ -obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o +obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o +obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o diff --git a/arch/arm/plat-spear/shirq.c b/drivers/irqchip/spear-shirq.c index 955c7249a5c1..80e1d2fd9d4c 100644 --- a/arch/arm/plat-spear/shirq.c +++ b/drivers/irqchip/spear-shirq.c @@ -1,11 +1,12 @@ /* - * arch/arm/plat-spear/shirq.c - * * SPEAr platform shared irq layer source file * - * Copyright (C) 2009 ST Microelectronics + * Copyright (C) 2009-2012 ST Microelectronics * Viresh Kumar <viresh.linux@gmail.com> * + * Copyright (C) 2012 ST Microelectronics + * Shiraz Hashim <shiraz.hashim@st.com> + * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. @@ -18,11 +19,11 @@ #include <linux/io.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/irqchip/spear-shirq.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/spinlock.h> -#include <plat/shirq.h> static DEFINE_SPINLOCK(lock); diff --git a/arch/arm/plat-spear/include/plat/shirq.h b/include/linux/irqchip/spear-shirq.h index c51b355f00de..c8be16d213a3 100644 --- a/arch/arm/plat-spear/include/plat/shirq.h +++ b/include/linux/irqchip/spear-shirq.h @@ -1,9 +1,7 @@ /* - * arch/arm/plat-spear/include/plat/shirq.h - * * SPEAr platform shared irq layer header file * - * Copyright (C) 2009 ST Microelectronics + * Copyright (C) 2009-2012 ST Microelectronics * Viresh Kumar <viresh.linux@gmail.com> * * This file is licensed under the terms of the GNU General Public @@ -11,8 +9,8 @@ * warranty of any kind, whether express or implied. */ -#ifndef __PLAT_SHIRQ_H -#define __PLAT_SHIRQ_H +#ifndef __SPEAR_SHIRQ_H +#define __SPEAR_SHIRQ_H #include <linux/irq.h> #include <linux/types.h> @@ -63,4 +61,4 @@ int __init spear310_shirq_of_init(struct device_node *np, int __init spear320_shirq_of_init(struct device_node *np, struct device_node *parent); -#endif /* __PLAT_SHIRQ_H */ +#endif /* __SPEAR_SHIRQ_H */ |