summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-29 09:02:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-29 09:02:15 -0700
commit83e7e5b54417e20aea7ce571a19af331a539027e (patch)
treeebe5780c67f3aebe3a1ef4df5ef04e9576a7c59c /arch/m68k
parentac435075892e3e651c667b4a9f2267cf3ef1d5a2 (diff)
parent58c116fb7dc6703a557fe79c6e6ebab1450082b3 (diff)
downloadblackbird-obmc-linux-83e7e5b54417e20aea7ce571a19af331a539027e.tar.gz
blackbird-obmc-linux-83e7e5b54417e20aea7ce571a19af331a539027e.zip
Merge tag 'm68k-for-v4.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "Just two small cleanups" * tag 'm68k-for-v4.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode m68k/atari: ARAnyM - Remove reference to long-deprecated MODULE_PARM
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/emu/nfeth.c4
-rw-r--r--arch/m68k/kernel/sun3-head.S6
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c
index e45ce4243aaa..a4ebd2445eda 100644
--- a/arch/m68k/emu/nfeth.c
+++ b/arch/m68k/emu/nfeth.c
@@ -47,10 +47,6 @@ static const char version[] =
MODULE_AUTHOR("Milan Jurik");
MODULE_DESCRIPTION("Atari NFeth driver");
MODULE_LICENSE("GPL");
-/*
-MODULE_PARM(nfeth_debug, "i");
-MODULE_PARM_DESC(nfeth_debug, "nfeth_debug level (1-2)");
-*/
static long nfEtherID;
diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
index faf18f4fab1f..d19a94754d56 100644
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
@@ -88,9 +88,3 @@ kpt:
.long 0
availmem:
.long 0
-| todo: remove next two. --m
-is_medusa:
- .long 0
-m68k_pgtable_cachemode:
- .long 0
-
OpenPOWER on IntegriCloud