Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / memstick / host / r592.c

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 767406c..668f5c6 100644 (file)
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -23,7 +23,7 @@
 #include <linux/swab.h>
 #include "r592.h"
 
-static int enable_dma = 1;
+static int r592_enable_dma = 1;
 static int debug;
 
 static const char *tpc_names[] = {
@@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
 /* Test if hardware supports DMA */
 static void r592_check_dma(struct r592_device *dev)
 {
-       dev->dma_capable = enable_dma &&
+       dev->dma_capable = r592_enable_dma &&
                (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
                        R592_FIFO_DMA_SETTINGS_CAP);
 }
@@ -796,7 +796,7 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (memstick_add_host(host))
                goto error7;
 
-       message("driver succesfully loaded");
+       message("driver successfully loaded");
        return 0;
 error7:
        free_irq(dev->irq, dev);
@@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
 module_init(r592_module_init);
 module_exit(r592_module_exit);
 
-module_param(enable_dma, bool, S_IRUGO);
+module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
 MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug level (0-3)");