Skip to content

Commit

Permalink
Merge tag 'm68k-for-v4.20-tag1' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Oct 29, 2018
2 parents ac43507 + 58c116f commit 83e7e5b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
4 changes: 0 additions & 4 deletions arch/m68k/emu/nfeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions arch/m68k/kernel/sun3-head.S
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,3 @@ kpt:
.long 0
availmem:
.long 0
| todo: remove next two. --m
is_medusa:
.long 0
m68k_pgtable_cachemode:
.long 0

0 comments on commit 83e7e5b

Please sign in to comment.