summaryrefslogtreecommitdiffstats
path: root/drivers/s390/char
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-10-29 16:38:43 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-10 16:55:46 +0100
commitc1eac0d034d36cfa0da3e35f2add6d6de1e696e5 (patch)
treedf6d68171a0668148a14afb682907f9421354f6d /drivers/s390/char
parent2d4d3b5d45f2885ec7e7ecd149ce7b975f4964dd (diff)
downloadlinux-c1eac0d034d36cfa0da3e35f2add6d6de1e696e5.tar.bz2
s390: char: make slp_ctl explicitly non-modular
The Makefile currently controlling compilation of this code is obj-y, meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular usage, so that when reading the driver there is no doubt it is builtin-only. Since module_misc_device translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com> Cc: linux-s390@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/char')
-rw-r--r--drivers/s390/char/sclp_ctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp_ctl.c b/drivers/s390/char/sclp_ctl.c
index 554eaa1e347d..78a7e4f94721 100644
--- a/drivers/s390/char/sclp_ctl.c
+++ b/drivers/s390/char/sclp_ctl.c
@@ -10,7 +10,7 @@
#include <linux/uaccess.h>
#include <linux/miscdevice.h>
#include <linux/gfp.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/ioctl.h>
#include <linux/fs.h>
#include <asm/compat.h>
@@ -126,4 +126,4 @@ static struct miscdevice sclp_ctl_device = {
.name = "sclp",
.fops = &sclp_ctl_fops,
};
-module_misc_device(sclp_ctl_device);
+builtin_misc_device(sclp_ctl_device);