summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-12 15:41:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-17 07:39:28 -0700
commitf0f65a95de2840db3fa61c953dca267e7b773168 (patch)
treeca5e9f56ce3a31ded989e20d2ae797a79ee63d4d
parent8e8c551f77fe80a1b8b8176db30b95c674ff9a8d (diff)
downloadlinux-stable-f0f65a95de2840db3fa61c953dca267e7b773168.tar.gz
linux-stable-f0f65a95de2840db3fa61c953dca267e7b773168.tar.bz2
linux-stable-f0f65a95de2840db3fa61c953dca267e7b773168.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>
-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 91d94b564433..2c4ed52ca849 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -981,4 +981,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");