diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-06 22:43:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-06 22:43:03 -0800 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /arch/cris/arch-v10/mm/init.c | |
| 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/mm/init.c')
| -rw-r--r-- | arch/cris/arch-v10/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/mm/init.c b/arch/cris/arch-v10/mm/init.c index 742fd1974c2..baa746ce4e7 100644 --- a/arch/cris/arch-v10/mm/init.c +++ b/arch/cris/arch-v10/mm/init.c @@ -12,7 +12,7 @@ #include <asm/mmu.h> #include <asm/io.h> #include <asm/mmu_context.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> extern void tlb_init(void); |