diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/coyote-pci.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-power.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-pci.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-power.c | 4 |
8 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index bf25a76e9bdf..7c25dbd5a181 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
@@ -288,7 +287,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs | |||
288 | 287 | ||
289 | static struct irqaction ixp4xx_timer_irq = { | 288 | static struct irqaction ixp4xx_timer_irq = { |
290 | .name = "IXP4xx Timer Tick", | 289 | .name = "IXP4xx Timer Tick", |
291 | .flags = SA_INTERRUPT | SA_TIMER, | 290 | .flags = IRQF_DISABLED | IRQF_TIMER, |
292 | .handler = ixp4xx_timer_interrupt, | 291 | .handler = ixp4xx_timer_interrupt, |
293 | }; | 292 | }; |
294 | 293 | ||
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c index e6b7fcd923fa..2cebb2878895 100644 --- a/arch/arm/mach-ixp4xx/coyote-pci.c +++ b/arch/arm/mach-ixp4xx/coyote-pci.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/irq.h> | ||
20 | 21 | ||
21 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
22 | #include <asm/hardware.h> | 23 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c index da415d5d7f37..d5156c043f0b 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c | |||
@@ -15,9 +15,9 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/config.h> | ||
19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/irq.h> | ||
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | 22 | ||
23 | #include <asm/mach/pci.h> | 23 | #include <asm/mach/pci.h> |
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c index 526fb6175bc3..ed5270800217 100644 --- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c | |||
@@ -16,10 +16,10 @@ | |||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/irq.h> | ||
19 | 20 | ||
20 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
21 | #include <asm/hardware.h> | 22 | #include <asm/hardware.h> |
22 | #include <asm/irq.h> | ||
23 | 23 | ||
24 | #include <asm/mach/pci.h> | 24 | #include <asm/mach/pci.h> |
25 | 25 | ||
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c index 26b7c001ff64..b8ebaf4a9c8e 100644 --- a/arch/arm/mach-ixp4xx/nas100d-pci.c +++ b/arch/arm/mach-ixp4xx/nas100d-pci.c | |||
@@ -15,9 +15,9 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/irq.h> | ||
21 | 21 | ||
22 | #include <asm/mach/pci.h> | 22 | #include <asm/mach/pci.h> |
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c index a3745ed37f9f..81ffcae1f56e 100644 --- a/arch/arm/mach-ixp4xx/nas100d-power.c +++ b/arch/arm/mach-ixp4xx/nas100d-power.c | |||
@@ -17,9 +17,9 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/module.h> | ||
21 | #include <linux/reboot.h> | ||
22 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
21 | #include <linux/irq.h> | ||
22 | #include <linux/module.h> | ||
23 | #include <linux/reboot.h> | 23 | #include <linux/reboot.h> |
24 | 24 | ||
25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
@@ -42,7 +42,7 @@ static int __init nas100d_power_init(void) | |||
42 | set_irq_type(NAS100D_RB_IRQ, IRQT_LOW); | 42 | set_irq_type(NAS100D_RB_IRQ, IRQT_LOW); |
43 | 43 | ||
44 | if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler, | 44 | if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler, |
45 | SA_INTERRUPT, "NAS100D reset button", NULL) < 0) { | 45 | IRQF_DISABLED, "NAS100D reset button", NULL) < 0) { |
46 | 46 | ||
47 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", | 47 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", |
48 | NAS100D_RB_IRQ); | 48 | NAS100D_RB_IRQ); |
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c index ece860444d5b..0de639d6e60a 100644 --- a/arch/arm/mach-ixp4xx/nslu2-pci.c +++ b/arch/arm/mach-ixp4xx/nslu2-pci.c | |||
@@ -15,7 +15,6 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/config.h> | ||
19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
21 | 20 | ||
diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c index 6d38e97142cc..e2a2230b69f0 100644 --- a/arch/arm/mach-ixp4xx/nslu2-power.c +++ b/arch/arm/mach-ixp4xx/nslu2-power.c | |||
@@ -54,7 +54,7 @@ static int __init nslu2_power_init(void) | |||
54 | set_irq_type(NSLU2_PB_IRQ, IRQT_HIGH); | 54 | set_irq_type(NSLU2_PB_IRQ, IRQT_HIGH); |
55 | 55 | ||
56 | if (request_irq(NSLU2_RB_IRQ, &nslu2_reset_handler, | 56 | if (request_irq(NSLU2_RB_IRQ, &nslu2_reset_handler, |
57 | SA_INTERRUPT, "NSLU2 reset button", NULL) < 0) { | 57 | IRQF_DISABLED, "NSLU2 reset button", NULL) < 0) { |
58 | 58 | ||
59 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", | 59 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", |
60 | NSLU2_RB_IRQ); | 60 | NSLU2_RB_IRQ); |
@@ -63,7 +63,7 @@ static int __init nslu2_power_init(void) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | if (request_irq(NSLU2_PB_IRQ, &nslu2_power_handler, | 65 | if (request_irq(NSLU2_PB_IRQ, &nslu2_power_handler, |
66 | SA_INTERRUPT, "NSLU2 power button", NULL) < 0) { | 66 | IRQF_DISABLED, "NSLU2 power button", NULL) < 0) { |
67 | 67 | ||
68 | printk(KERN_DEBUG "Power Button IRQ %d not available\n", | 68 | printk(KERN_DEBUG "Power Button IRQ %d not available\n", |
69 | NSLU2_PB_IRQ); | 69 | NSLU2_PB_IRQ); |