diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:39:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:39:50 -0400 |
| commit | 4c7145a1ec1bb789d5f07e47510e8bda546a7c4a (patch) | |
| tree | e2767b77e5413473a3bba302237f4669a203f183 /arch/arm/mach-msm/irq.c | |
| parent | 74e91604b2452c15bbe72d77b37cf47ed0310d13 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/spinlocks
Done to prevent this failure of an Octopus merge:
Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed
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 | ||