media/staging: fix allyesconfig build error
Subsystems (2)
PATCH 1/1 media/staging: fix allyesconfig build error
From: Randy Dunlap <[email protected]>
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
Signed-off-by Randy Dunlap <[email protected]>
Cc Pierrick Hascoet <[email protected]>
--- drivers/staging/media/as102/as102_drv.c | 4 ++-- drivers/staging/media/as102/as102_drv.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
Thou shalt have no non-static identifiers that are named 'debug'.
drivers/staging/media/as102/as102_drv.c +2 -2
@@ -32,8 +32,8 @@#include "as102_fw.h" #include "dvbdev.h" -int debug; -module_param_named (debug, debug, int,0644 ); +int as102_debug; +module_param_named (debug, as102_debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off debugging (default: off)" );int dual_tuner;
drivers/staging/media/as102/as102_drv.h +2 -1
@@ -37,7 +37,8 @@ extern struct spi_driver as102_spi_drive#define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"#define DRIVER_NAME "as10x_usb" -extern int debug; +extern int as102_debug; +#define debug as102_debug #define dprintk(debug, args...) \ do { if (debug) { \