summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-18 11:40:46 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-25 11:04:01 +0000
commit0dada61a29ddaaca5985c76aafec341b4ad3e989 (patch)
treed34e8b34f9f9ed0dd01004c3dec91e41cc8eaff4 /arch/arm/mach-integrator
parent8a47ae8b96640bc9f049dce0d8ba6980176da0ea (diff)
ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ initializers
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r--arch/arm/mach-integrator/core.c10
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 019f0ab08f6..29baef9d8f7 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -44,7 +44,7 @@ static struct amba_device rtc_device = {
.end = INTEGRATOR_RTC_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
- .irq = { IRQ_RTCINT, NO_IRQ },
+ .irq = { IRQ_RTCINT },
};
static struct amba_device uart0_device = {
@@ -57,7 +57,7 @@ static struct amba_device uart0_device = {
.end = INTEGRATOR_UART0_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
- .irq = { IRQ_UARTINT0, NO_IRQ },
+ .irq = { IRQ_UARTINT0 },
};
static struct amba_device uart1_device = {
@@ -70,7 +70,7 @@ static struct amba_device uart1_device = {
.end = INTEGRATOR_UART1_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
- .irq = { IRQ_UARTINT1, NO_IRQ },
+ .irq = { IRQ_UARTINT1 },
};
static struct amba_device kmi0_device = {
@@ -82,7 +82,7 @@ static struct amba_device kmi0_device = {
.end = KMI0_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
- .irq = { IRQ_KMIINT0, NO_IRQ },
+ .irq = { IRQ_KMIINT0 },
};
static struct amba_device kmi1_device = {
@@ -94,7 +94,7 @@ static struct amba_device kmi1_device = {
.end = KMI1_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
- .irq = { IRQ_KMIINT1, NO_IRQ },
+ .irq = { IRQ_KMIINT1 },
};
static struct amba_device *amba_devs[] __initdata = {
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index a8b6aa6003f..ecc08ed4f3c 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -370,7 +370,7 @@ static struct amba_device aaci_device = {
.end = INTEGRATOR_CP_AACI_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
- .irq = { IRQ_CP_AACIINT, NO_IRQ },
+ .irq = { IRQ_CP_AACIINT },
.periphid = 0,
};
@@ -437,7 +437,7 @@ static struct amba_device clcd_device = {
.flags = IORESOURCE_MEM,
},
.dma_mask = ~0,
- .irq = { IRQ_CP_CLCDCINT, NO_IRQ },
+ .irq = { IRQ_CP_CLCDCINT },
.periphid = 0,
};