From 08785e238778f0654734130b4c072ad6b529c9f3 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Mar 2011 16:24:29 -0700
Subject: [PATCH] --- yaml --- r: 243209 b: refs/heads/master c:
 5ede9ddfba424b5dad96e7ccd55607875a64ff6c h: refs/heads/master i:   243207:
 347eed89bf911437097f5fb2e0befba8a15482a9 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/memstick/host/r592.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dbf6859c15c7..466ff140ac88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5850150d0b9ae16840c5d9846f9d5a759996a15
+refs/heads/master: 5ede9ddfba424b5dad96e7ccd55607875a64ff6c
diff --git a/trunk/drivers/memstick/host/r592.c b/trunk/drivers/memstick/host/r592.c
index 767406c95291..700d420a59ac 100644
--- a/trunk/drivers/memstick/host/r592.c
+++ b/trunk/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);
 }
@@ -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)");