diff options
-rw-r--r-- | drivers/memstick/host/r592.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index 767406c95291..700d420a59ac 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/swab.h> | 23 | #include <linux/swab.h> |
24 | #include "r592.h" | 24 | #include "r592.h" |
25 | 25 | ||
26 | static int enable_dma = 1; | 26 | static int r592_enable_dma = 1; |
27 | static int debug; | 27 | static int debug; |
28 | 28 | ||
29 | static const char *tpc_names[] = { | 29 | static const char *tpc_names[] = { |
@@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error) | |||
267 | /* Test if hardware supports DMA */ | 267 | /* Test if hardware supports DMA */ |
268 | static void r592_check_dma(struct r592_device *dev) | 268 | static void r592_check_dma(struct r592_device *dev) |
269 | { | 269 | { |
270 | dev->dma_capable = enable_dma && | 270 | dev->dma_capable = r592_enable_dma && |
271 | (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) & | 271 | (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) & |
272 | R592_FIFO_DMA_SETTINGS_CAP); | 272 | R592_FIFO_DMA_SETTINGS_CAP); |
273 | } | 273 | } |
@@ -898,7 +898,7 @@ static void __exit r592_module_exit(void) | |||
898 | module_init(r592_module_init); | 898 | module_init(r592_module_init); |
899 | module_exit(r592_module_exit); | 899 | module_exit(r592_module_exit); |
900 | 900 | ||
901 | module_param(enable_dma, bool, S_IRUGO); | 901 | module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO); |
902 | MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)"); | 902 | MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)"); |
903 | module_param(debug, int, S_IRUGO | S_IWUSR); | 903 | module_param(debug, int, S_IRUGO | S_IWUSR); |
904 | MODULE_PARM_DESC(debug, "Debug level (0-3)"); | 904 | MODULE_PARM_DESC(debug, "Debug level (0-3)"); |