luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media/staging: fix allyesconfig build error

Browse Source 
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>
This commit is contained in:
Randy Dunlap 2011-11-16 18:17:03 -08:00 committed by Linus Torvalds
parent 6aaf05f472
commit d29387e8de
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/as102/as102_drv.c
View File

@ -32,8 +32,8 @@
#include "as102_fw.h" #include "as102_fw.h"
#include "dvbdev.h" #include "dvbdev.h"
int debug; int as102_debug;
module_param_named(debug, debug, int, 0644); module_param_named(debug, as102_debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)"); MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)");
int dual_tuner; int dual_tuner;

3
drivers/staging/media/as102/as102_drv.h
View File

@ -37,7 +37,8 @@ extern struct spi_driver as102_spi_driver;
#define DRIVER_FULL_NAME "Abilis Systems as10x usb driver" #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
#define DRIVER_NAME "as10x_usb" #define DRIVER_NAME "as10x_usb"
extern int debug; extern int as102_debug;
#define debug as102_debug
#define dprintk(debug, args...) \ #define dprintk(debug, args...) \
do { if (debug) { \ do { if (debug) { \