diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/plat-mxc/irq.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/plat-mxc/irq.c')
| -rw-r--r-- | arch/arm/plat-mxc/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c index 1fbe01da6925..1053b666c676 100644 --- a/arch/arm/plat-mxc/irq.c +++ b/arch/arm/plat-mxc/irq.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/arch/common.h> | 22 | #include <mach/common.h> |
| 23 | 23 | ||
| 24 | #define AVIC_BASE IO_ADDRESS(AVIC_BASE_ADDR) | 24 | #define AVIC_BASE IO_ADDRESS(AVIC_BASE_ADDR) |
| 25 | #define AVIC_INTCNTL (AVIC_BASE + 0x00) /* int control reg */ | 25 | #define AVIC_INTCNTL (AVIC_BASE + 0x00) /* int control reg */ |