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-v10/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-v10/kernel/entry.S')
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index 3a65f322ae0..ed171d389e6 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/linkage.h> | 23 | #include <linux/linkage.h> |
| 24 | #include <linux/sys.h> | 24 | #include <linux/sys.h> |
| 25 | #include <asm/unistd.h> | 25 | #include <asm/unistd.h> |
| 26 | #include <asm/arch/sv_addr_ag.h> | 26 | #include <arch/sv_addr_ag.h> |
| 27 | #include <asm/errno.h> | 27 | #include <asm/errno.h> |
| 28 | #include <asm/thread_info.h> | 28 | #include <asm/thread_info.h> |
| 29 | #include <asm/asm-offsets.h> | 29 | #include <asm/asm-offsets.h> |