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

media/staging: fix allyesconfig build error

Fix x86 allyesconfig builds. Builds fail due to a non-static variable
named 'debug' in drivers/staging/media/as102:

arch/x86/built-in.o:arch/x86/kernel/entry_32.S:1296: first defined here
ld: Warning: size of symbol `debug' changed from 90 in arch/x86/built-in.o to 4 in drivers/built-in.o

Thou shalt have no non-static identifiers that are named 'debug'.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Pierrick Hascoet <pierrick.hascoet@abilis.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Randy Dunlap and committed by
Linus Torvalds
d29387e8 6aaf05f4

+4 -3
+2 -2
drivers/staging/media/as102/as102_drv.c
··· 32 32 #include "as102_fw.h" 33 33 #include "dvbdev.h" 34 34 35 - int debug; 36 - module_param_named(debug, debug, int, 0644); 35 + int as102_debug; 36 + module_param_named(debug, as102_debug, int, 0644); 37 37 MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)"); 38 38 39 39 int dual_tuner;
+2 -1
drivers/staging/media/as102/as102_drv.h
··· 37 37 #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver" 38 38 #define DRIVER_NAME "as10x_usb" 39 39 40 - extern int debug; 40 + extern int as102_debug; 41 + #define debug as102_debug 41 42 42 43 #define dprintk(debug, args...) \ 43 44 do { if (debug) { \