From 35f53aafb60ebc3a26e5508e0e87bfc88c703654 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 17 Oct 2008 13:19:08 +0100 Subject: [ARM] pxa: fix redefinition of NR_IRQS arch/arm/mach-pxa/include/mach/irqs.h:193:1: warning: "NR_IRQS" redefined arch/arm/mach-pxa/include/mach/irqs.h:263:1: warning: this is the location of the previous definition Signed-off-by: Russell King --- arch/arm/mach-pxa/include/mach/irqs.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-pxa/include') diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 9c163e19ada..32bb4a2eb7f 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h @@ -9,7 +9,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#ifndef __ASM_MACH_IRQS_H +#define __ASM_MACH_IRQS_H #ifdef CONFIG_PXA_HAVE_ISA_IRQS #define PXA_ISA_IRQ(x) (x) @@ -264,3 +265,5 @@ #endif #endif /* CONFIG_PCI_HOST_ITE8152 */ + +#endif /* __ASM_MACH_IRQS_H */ -- cgit v1.2.3 From 74ca1ec2ce62cd31952703c6e36911b23d70623c Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Sat, 18 Oct 2008 14:56:43 +0200 Subject: [ARM] balance parenthesis in header file Hello, Introduced by: commit fff147208b48680cb7b627a144113a6585828a0e Author: Eric Miao Date: Fri Sep 5 22:15:23 2008 +0800 Signed-off-by: Mariusz Kozlowski Signed-off-by: Russell King --- arch/arm/mach-pxa/include/mach/spitz.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-pxa/include') diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h index 31ac26b55bc..e8488dfb7e9 100644 --- a/arch/arm/mach-pxa/include/mach/spitz.h +++ b/arch/arm/mach-pxa/include/mach/spitz.h @@ -142,7 +142,7 @@ #define SPITZ_SCP2_GPIO_BASE (NR_BUILTIN_GPIO + 12) #define SPITZ_GPIO_IR_ON (SPITZ_SCP2_GPIO_BASE + 0) -#define SPITZ_GPIO_AKIN_PULLUP (SPITZ_SCP2_GPIO_BASE + 1 +#define SPITZ_GPIO_AKIN_PULLUP (SPITZ_SCP2_GPIO_BASE + 1) #define SPITZ_GPIO_RESERVED_1 (SPITZ_SCP2_GPIO_BASE + 2) #define SPITZ_GPIO_RESERVED_2 (SPITZ_SCP2_GPIO_BASE + 3) #define SPITZ_GPIO_RESERVED_3 (SPITZ_SCP2_GPIO_BASE + 4) -- cgit v1.2.3