[media] s5p_mfc: don't use an external symbol called 'debug'
The 'debug' name is known to cause conflicts with allyesconfig on several archs. So, localize its name. >> drivers/built-in.o:(.bss+0xc7ee2c): multiple definition of `debug' arch/x86/built-in.o:(.entry.text+0xf78): first defined here ld: Warning: size of symbol `debug' changed from 86 in arch/x86/built-in.o to 4 in drivers/built-in.o While here, fix a wrong file name reference Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Родитель
9842a417d4
Коммит
139adba64c
|
@ -37,8 +37,8 @@
|
|||
#define S5P_MFC_DEC_NAME "s5p-mfc-dec"
|
||||
#define S5P_MFC_ENC_NAME "s5p-mfc-enc"
|
||||
|
||||
int debug;
|
||||
module_param(debug, int, S_IRUGO | S_IWUSR);
|
||||
int mfc_debug_level;
|
||||
module_param_named(debug, mfc_debug_level, int, S_IRUGO | S_IWUSR);
|
||||
MODULE_PARM_DESC(debug, "Debug level - higher value produces more verbose messages");
|
||||
|
||||
/* Helper functions for interrupt processing */
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* drivers/media/platform/samsung/mfc5/s5p_mfc_debug.h
|
||||
* drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
|
||||
*
|
||||
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
|
||||
* This file contains debug macros
|
||||
|
@ -18,11 +18,11 @@
|
|||
#define DEBUG
|
||||
|
||||
#ifdef DEBUG
|
||||
extern int debug;
|
||||
extern int mfc_debug_level;
|
||||
|
||||
#define mfc_debug(level, fmt, args...) \
|
||||
do { \
|
||||
if (debug >= level) \
|
||||
if (mfc_debug_level >= level) \
|
||||
printk(KERN_DEBUG "%s:%d: " fmt, \
|
||||
__func__, __LINE__, ##args); \
|
||||
} while (0)
|
||||
|
|
Загрузка…
Ссылка в новой задаче