Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d29387e8 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Cc: Pierrick Hascoet <pierrick.hascoet@abilis.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6aaf05f4

drivers/staging/media/as102/as102_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ extern struct spi_driver as102_spi_driver; 
#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) {	\