aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-12 15:41:31 -0700
committerSimon Shields <keepcalm444@gmail.com>2016-06-12 21:19:50 +1000
commita491dd7878acecaf69e94131f2834afd72e64f19 (patch)
tree8faceb82fb4484b5dbca99e913a997251d05ca8f /drivers/staging
parent4b85df5990d1cd6cf04ca48e54a711774081c657 (diff)
downloadkernel_samsung_smdk4412-a491dd7878acecaf69e94131f2834afd72e64f19.tar.gz
kernel_samsung_smdk4412-a491dd7878acecaf69e94131f2834afd72e64f19.tar.bz2
kernel_samsung_smdk4412-a491dd7878acecaf69e94131f2834afd72e64f19.zip
Revert "staging: zram: Add auto loading of module if user opens /dev/zram."
This reverts commit c70bda992c12e593e411c02a52e4bd6985407539. It's incorrect, Kay writes: Please just remove it. "devname" is meant to be used for single-instance devices with a static dev_t, never for things like zramX. It will not do anything useful here, it does nothing really without a statically assigned dev_t, and it should not be used for devices of this kind anyway. Reported-by: Tom Gundersen <teg@jklm.no> Reported-by: Kay Sievers <kay@vrfy.org> Cc: Minchan Kim <minchan@kernel.org> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/zram/zram_drv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 6063c11375a..91fe3a143a0 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -994,4 +994,3 @@ MODULE_PARM_DESC(num_devices, "Number of zram devices");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Nitin Gupta <ngupta@vflare.org>");
MODULE_DESCRIPTION("Compressed RAM Block Device");
-MODULE_ALIAS("devname:zram");