diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-22 06:07:57 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-26 18:52:02 -0300 |
| commit | 139adba64cdde218e6a679f1d5b675fee937a8d8 (patch) | |
| tree | 44e5d303fab48fa86b3f6a6d6e21b67aa761561d /drivers/media/platform/s5p-mfc/s5p_mfc_debug.h | |
| parent | 9842a417d46bf40f2d460120016b6392d3ac32c9 (diff) | |
| download | linux-139adba64cdde218e6a679f1d5b675fee937a8d8.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_debug.h')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_debug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h index 8e608f5aa0d7..5936923c631c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h @@ -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) |