diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-10-15 13:48:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-10-15 13:48:37 +0100 |
| commit | 2326eb985b8844f44e150489c76f5cb56fa381b4 (patch) | |
| tree | 889b626938d9fcbef623b006f5af87737b92e331 | |
| parent | 8e25b84e76a0b2c117218405818cadd591512ff8 (diff) | |
| download | op-kernel-dev-2326eb985b8844f44e150489c76f5cb56fa381b4.zip op-kernel-dev-2326eb985b8844f44e150489c76f5cb56fa381b4.tar.gz | |
[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.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 2 | ||||
| -rw-r--r-- | arch/arm/oprofile/op_model_xscale.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index fa5d497..1463330 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -16,6 +16,7 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/ioport.h> +#include <linux/irq.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index ee80d62..142c33c 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) if (LUB_IRQ_SET_CLR & (1 << 0)) mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE); else { - (void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data, NULL); + (void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data); enable_irq(LUBBOCK_SD_IRQ); } } diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c index 7899d3c..7c3289c 100644 --- a/arch/arm/oprofile/op_model_xscale.c +++ b/arch/arm/oprofile/op_model_xscale.c @@ -20,7 +20,8 @@ #include <linux/sched.h> #include <linux/oprofile.h> #include <linux/interrupt.h> -#include <asm/irq.h> +#include <linux/irq.h> + #include <asm/system.h> #include "op_counter.h" |
