diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 21:34:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 21:34:01 +0200 |
| commit | 604a2785a8482cad4d63202465133c720db5eda7 (patch) | |
| tree | e2f510a8a54d7d4443cb52f3a0be46f527ebb779 /arch/blackfin/kernel/entry.S | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE (diff) | |
| download | linux-604a2785a8482cad4d63202465133c720db5eda7.tar.xz linux-604a2785a8482cad4d63202465133c720db5eda7.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
Blackfin arch: sram: use 'unsigned long' for irqflags
Blackfin arch: let PCI depend on BROKEN
Blackfin arch: move include/asm-blackfin header files to arch/blackfin
Blackfin arch: fix bug - MPU crashes under stress
Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
Diffstat (limited to 'arch/blackfin/kernel/entry.S')
| -rw-r--r-- | arch/blackfin/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S index 31bd9bf3efae..faea88ebb2ef 100644 --- a/arch/blackfin/kernel/entry.S +++ b/arch/blackfin/kernel/entry.S @@ -32,7 +32,7 @@ #include <asm/errno.h> #include <asm/asm-offsets.h> -#include <asm/mach-common/context.S> +#include <asm/context.S> #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 .section .l1.text |