Skip to content

Commit

Permalink
media/staging: fix allyesconfig build error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Nov 17, 2011
1 parent 6aaf05f commit d29387e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/media/as102/as102_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/media/as102/as102_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) { \
Expand Down

0 comments on commit d29387e

Please sign in to comment.