aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-10-15 08:48:37 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-15 08:48:37 -0400
commit2326eb985b8844f44e150489c76f5cb56fa381b4 (patch)
tree889b626938d9fcbef623b006f5af87737b92e331
parent8e25b84e76a0b2c117218405818cadd591512ff8 (diff)
[ARM] Fix fallout from IRQ regs changes
Some ARM platforms were still broken as a result of the IRQ register passing changes, mostly due to a missing linux/irq.h include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-footbridge/dc21285.c1
-rw-r--r--arch/arm/mach-pxa/lubbock.c2
-rw-r--r--arch/arm/oprofile/op_model_xscale.c3
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index fa5d4976f514..1463330ed8ee 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -16,6 +16,7 @@
16#include <linux/slab.h> 16#include <linux/slab.h>
17#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/ioport.h> 18#include <linux/ioport.h>
19#include <linux/irq.h>
19 20
20#include <asm/io.h> 21#include <asm/io.h>
21#include <asm/irq.h> 22#include <asm/irq.h>
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index ee80d62119d3..142c33c3dff5 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -397,7 +397,7 @@ static void lubbock_mmc_poll(unsigned long data)
397 if (LUB_IRQ_SET_CLR & (1 << 0)) 397 if (LUB_IRQ_SET_CLR & (1 << 0))
398 mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE); 398 mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE);
399 else { 399 else {
400 (void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data, NULL); 400 (void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data);
401 enable_irq(LUBBOCK_SD_IRQ); 401 enable_irq(LUBBOCK_SD_IRQ);
402 } 402 }
403} 403}
diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c
index 7899d3ca75a3..7c3289c2acd7 100644
--- a/arch/arm/oprofile/op_model_xscale.c
+++ b/arch/arm/oprofile/op_model_xscale.c
@@ -20,7 +20,8 @@
20#include <linux/sched.h> 20#include <linux/sched.h>
21#include <linux/oprofile.h> 21#include <linux/oprofile.h>
22#include <linux/interrupt.h> 22#include <linux/interrupt.h>
23#include <asm/irq.h> 23#include <linux/irq.h>
24
24#include <asm/system.h> 25#include <asm/system.h>
25 26
26#include "op_counter.h" 27#include "op_counter.h"