mtd: nand: r852: fix name space clash

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=ada496578850cb063ccf64d43a293cfcc9d32bf8
Commit:     ada496578850cb063ccf64d43a293cfcc9d32bf8
Parent:     b2aaf7a2b476820cf5fd7738e8641ed88046acf5
Author:     Stephen Rothwell <sfr at canb.auug.org.au>
AuthorDate: Mon Mar 1 20:21:06 2010 +1100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Mar 8 18:33:19 2010 -0800

    mtd: nand: r852: fix name space clash
    
    and include delay.h for msleep().
    
    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/r852.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 96db476..f5a0bc7 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -13,15 +13,16 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/pci_ids.h>
+#include <linux/delay.h>
 #include <asm/byteorder.h>
 #include <linux/sched.h>
 #include "sm_common.h"
 #include "r852.h"
 
 
-static int enable_dma = 1;
-module_param(enable_dma, bool, S_IRUGO);
-MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
+static int r852_enable_dma = 1;
+module_param(r852_enable_dma, bool, S_IRUGO);
+MODULE_PARM_DESC(r852_enable_dma, "Enable usage of the DMA (default)");
 
 static int debug;
 module_param(debug, int, S_IRUGO | S_IWUSR);
@@ -75,7 +76,7 @@ static void r852_dma_test(struct r852_device *dev)
 	if (!dev->dma_usable)
 		message("Non dma capable device detected, dma disabled");
 
-	if (!enable_dma) {
+	if (!r852_enable_dma) {
 		message("disabling dma on user request");
 		dev->dma_usable = 0;
 	}