diff options
| author | David S. Miller | 2011-08-08 08:20:26 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-08-08 08:20:26 +0200 |
| commit | 19fd61785a580c60cba900c5171bfadb57dd5056 (patch) | |
| tree | 1e491fb014be0dc03f4b6755bb94e73afd38c455 /arch/sparc/kernel/head_64.S | |
| parent | netxen: add vlan LRO support (diff) | |
| parent | dp83640: increase receive time stamp buffer size (diff) | |
| download | kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.gz kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.xz kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/sparc/kernel/head_64.S')
| -rw-r--r-- | arch/sparc/kernel/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S index c752603a7c0d..0eac1b2fc53d 100644 --- a/arch/sparc/kernel/head_64.S +++ b/arch/sparc/kernel/head_64.S @@ -559,7 +559,7 @@ niagara2_patch: nop call niagara_patch_bzero nop - call niagara2_patch_pageops + call niagara_patch_pageops nop ba,a,pt %xcc, 80f |