media/staging: fix allyesconfig build error
authorRandy Dunlap <rdunlap@xenotime.net>
Thu, 17 Nov 2011 02:17:03 +0000 (18:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Nov 2011 12:29:02 +0000 (10:29 -0200)
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>
drivers/staging/media/as102/as102_drv.c
drivers/staging/media/as102/as102_drv.h

index d335c7d6fa0f849ac22dbdbe526948dafb5e872b..828526d4c28985221e6b6ebba019053e1a137d21 100644 (file)
@@ -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;
index bcda635b5a9967454f95c843ccf4ae4c42a22d15..fd33f5a12dcc2167cf9dada508b13521f7159b8f 100644 (file)
@@ -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) {       \