diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/blackfin/mach-common/interrupt.S | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.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 | ||