提交 83e7e5b5 编写于 作者: L Linus Torvalds

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
...@@ -47,10 +47,6 @@ static const char version[] = ...@@ -47,10 +47,6 @@ static const char version[] =
MODULE_AUTHOR("Milan Jurik"); MODULE_AUTHOR("Milan Jurik");
MODULE_DESCRIPTION("Atari NFeth driver"); MODULE_DESCRIPTION("Atari NFeth driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/*
MODULE_PARM(nfeth_debug, "i");
MODULE_PARM_DESC(nfeth_debug, "nfeth_debug level (1-2)");
*/
static long nfEtherID; static long nfEtherID;
......
...@@ -88,9 +88,3 @@ kpt: ...@@ -88,9 +88,3 @@ kpt:
.long 0 .long 0
availmem: availmem:
.long 0 .long 0
| todo: remove next two. --m
is_medusa:
.long 0
m68k_pgtable_cachemode:
.long 0
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册