diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2011-11-16 21:17:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-17 07:29:02 -0500 |
commit | d29387e8de8bdf64374874112b2b1540d3ada674 (patch) | |
tree | b566b15c1d11e02285d3974c6cc334d4c2d518c9 /drivers | |
parent | 6aaf05f472c97ebceff47d9eef464574f1a55727 (diff) |
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: Randy Dunlap <rdunlap@xenotime.net>
Cc: Pierrick Hascoet <pierrick.hascoet@abilis.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/media/as102/as102_drv.c | 4 | ||||
-rw-r--r-- | drivers/staging/media/as102/as102_drv.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c index d335c7d6fa0f..828526d4c289 100644 --- a/drivers/staging/media/as102/as102_drv.c +++ b/drivers/staging/media/as102/as102_drv.c | |||
@@ -32,8 +32,8 @@ | |||
32 | #include "as102_fw.h" | 32 | #include "as102_fw.h" |
33 | #include "dvbdev.h" | 33 | #include "dvbdev.h" |
34 | 34 | ||
35 | int debug; | 35 | int as102_debug; |
36 | module_param_named(debug, debug, int, 0644); | 36 | module_param_named(debug, as102_debug, int, 0644); |
37 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)"); | 37 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)"); |
38 | 38 | ||
39 | int dual_tuner; | 39 | int dual_tuner; |
diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h index bcda635b5a99..fd33f5a12dcc 100644 --- a/drivers/staging/media/as102/as102_drv.h +++ b/drivers/staging/media/as102/as102_drv.h | |||
@@ -37,7 +37,8 @@ extern struct spi_driver as102_spi_driver; | |||
37 | #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver" | 37 | #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver" |
38 | #define DRIVER_NAME "as10x_usb" | 38 | #define DRIVER_NAME "as10x_usb" |
39 | 39 | ||
40 | extern int debug; | 40 | extern int as102_debug; |
41 | #define debug as102_debug | ||
41 | 42 | ||
42 | #define dprintk(debug, args...) \ | 43 | #define dprintk(debug, args...) \ |
43 | do { if (debug) { \ | 44 | do { if (debug) { \ |