diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /arch/blackfin/mach-common/interrupt.S | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'arch/blackfin/mach-common/interrupt.S')
| -rw-r--r-- | arch/blackfin/mach-common/interrupt.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S index 7f752c87fe46..b27e59d32401 100644 --- a/arch/blackfin/mach-common/interrupt.S +++ b/arch/blackfin/mach-common/interrupt.S | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <asm/blackfin.h> | 31 | #include <asm/blackfin.h> |
| 32 | #include <asm/mach/irq.h> | 32 | #include <mach/irq.h> |
| 33 | #include <linux/linkage.h> | 33 | #include <linux/linkage.h> |
| 34 | #include <asm/entry.h> | 34 | #include <asm/entry.h> |
| 35 | #include <asm/asm-offsets.h> | 35 | #include <asm/asm-offsets.h> |
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <asm/traps.h> | 37 | #include <asm/traps.h> |
| 38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
| 39 | 39 | ||
| 40 | #include <asm/mach-common/context.S> | 40 | #include <asm/context.S> |
| 41 | 41 | ||
| 42 | .extern _ret_from_exception | 42 | .extern _ret_from_exception |
| 43 | 43 | ||