tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

memstick: make enable_dma less generic in r592

Fixes this build error:

drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Alex Dubov <oakad@yahoo.com>
Acked-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Stephen Rothwell and committed by Linus Torvalds 5ede9ddf c5850150

+3 -3
unified split
+3 -3
drivers/memstick/host/r592.c
··· 23 #include <linux/swab.h> 24 #include "r592.h" 25 26 - static int enable_dma = 1; 27 static int debug; 28 29 static const char *tpc_names[] = { ··· 267 /* Test if hardware supports DMA */ 268 static void r592_check_dma(struct r592_device *dev) 269 { 270 - dev->dma_capable = enable_dma && 271 (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) & 272 R592_FIFO_DMA_SETTINGS_CAP); 273 } ··· 898 module_init(r592_module_init); 899 module_exit(r592_module_exit); 900 901 - module_param(enable_dma, bool, S_IRUGO); 902 MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)"); 903 module_param(debug, int, S_IRUGO | S_IWUSR); 904 MODULE_PARM_DESC(debug, "Debug level (0-3)");
··· 23 #include <linux/swab.h> 24 #include "r592.h" 25 26 + static int r592_enable_dma = 1; 27 static int debug; 28 29 static const char *tpc_names[] = { ··· 267 /* Test if hardware supports DMA */ 268 static void r592_check_dma(struct r592_device *dev) 269 { 270 + dev->dma_capable = r592_enable_dma && 271 (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) & 272 R592_FIFO_DMA_SETTINGS_CAP); 273 } ··· 898 module_init(r592_module_init); 899 module_exit(r592_module_exit); 900 901 + module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO); 902 MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)"); 903 module_param(debug, int, S_IRUGO | S_IWUSR); 904 MODULE_PARM_DESC(debug, "Debug level (0-3)");