diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /arch/cris/arch-v32/kernel/entry.S | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'arch/cris/arch-v32/kernel/entry.S')
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index eebbaba45430..7f6f93e6b70e 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
| 25 | #include <asm/asm-offsets.h> | 25 | #include <asm/asm-offsets.h> |
| 26 | 26 | ||
| 27 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 27 | #include <hwregs/asm/reg_map_asm.h> |
| 28 | #include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> | 28 | #include <hwregs/asm/intr_vect_defs_asm.h> |
| 29 | 29 | ||
| 30 | ;; Exported functions. | 30 | ;; Exported functions. |
| 31 | .globl system_call | 31 | .globl system_call |