aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-11 20:59:57 -0700
committerDavid S. Miller <davem@davemloft.net>2012-05-11 20:59:57 -0700
commit288e58cd03a75d66fdea0c666edf7d6bd3d112e7 (patch)
tree93f121aacf9e2faae3ae788de337e8738aa5fe1c /arch/sparc/kernel
parent59a0c3d91e038f97be5df5243a41a0e33db53122 (diff)
downloadlinux-288e58cd03a75d66fdea0c666edf7d6bd3d112e7.tar.gz
sparc32: Remove sun4c floppy assembler.
There were two blocks of code for the two ways to twiddle the terminal count pin in the AUXIO register, one for sun4c and one for sun4m. Kill the former. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/entry.S11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index b7a543cfeff..1b87ea088e1 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -125,20 +125,11 @@ floppy_tdone:
set sparc_cpu_model, %l5
ld [%l5], %l5
- subcc %l5, 1, %g0 /* enum { sun4c = 1 }; */
- be 1f
- ldub [%l7], %l5
+ ldub [%l7], %l5
or %l5, 0xc2, %l5
stb %l5, [%l7]
andn %l5, 0x02, %l5
- b 2f
- nop
-
-1:
- or %l5, 0xf4, %l5
- stb %l5, [%l7]
- andn %l5, 0x04, %l5
2:
/* Kill some time so the bits set */