diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/mach-rpc/irq.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/mach-rpc/irq.c')
| -rw-r--r-- | arch/arm/mach-rpc/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c index 7a029621db43..9dd15d679c5d 100644 --- a/arch/arm/mach-rpc/irq.c +++ b/arch/arm/mach-rpc/irq.c | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 2 | #include <linux/list.h> | 2 | #include <linux/list.h> |
| 3 | #include <linux/io.h> | ||
| 3 | 4 | ||
| 4 | #include <asm/mach/irq.h> | 5 | #include <asm/mach/irq.h> |
| 5 | #include <asm/hardware/iomd.h> | 6 | #include <asm/hardware/iomd.h> |
| 6 | #include <asm/irq.h> | 7 | #include <asm/irq.h> |
| 7 | #include <asm/io.h> | ||
| 8 | 8 | ||
| 9 | static void iomd_ack_irq_a(unsigned int irq) | 9 | static void iomd_ack_irq_a(unsigned int irq) |
| 10 | { | 10 | { |