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-msm/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-msm/irq.c')
| -rw-r--r-- | arch/arm/mach-msm/irq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c index 66901baf8c8e..04b8d182ff8a 100644 --- a/arch/arm/mach-msm/irq.c +++ b/arch/arm/mach-msm/irq.c | |||
| @@ -19,11 +19,10 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/ptrace.h> | 20 | #include <linux/ptrace.h> |
| 21 | #include <linux/timer.h> | 21 | #include <linux/timer.h> |
| 22 | |||
| 23 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
| 24 | #include <mach/hardware.h> | 23 | #include <linux/io.h> |
| 25 | 24 | ||
| 26 | #include <asm/io.h> | 25 | #include <mach/hardware.h> |
| 27 | 26 | ||
| 28 | #include <mach/msm_iomap.h> | 27 | #include <mach/msm_iomap.h> |
| 29 | 28 | ||