[PATCH] fix qla{2,4} build error

commit 0181944fe647cae18d545ac1167df3d15d393701 adds a
'extended_error_logging' global variable to qla2xxx which is defined by
qla4xxx too.

Trying to build both drivers results in the following error:

  LD      drivers/scsi/built-in.o
  drivers/scsi/qla4xxx/built-in.o: In function `qla4xxx_slave_configure':
  drivers/scsi/qla4xxx/ql4_os.c:1433: multiple definition of `extended_error_logging'
  drivers/scsi/qla2xxx/built-in.o:drivers/scsi/qla2xxx/qla_os.c:2166:
  first defined here
  make[2]: *** [drivers/scsi/built-in.o] Error 1
  make[1]: *** [drivers/scsi] Error 2
  make: *** [drivers] Error 2

The following patch simply adds a qla2_ (qla4_ respectively) prefix to
the variable name.

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 533425338e05..90dad7e88985 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -38,7 +38,7 @@
 * Macros use for debugging the driver.
 */
 
-#define DEBUG(x)        do { if (extended_error_logging) { x; } } while (0)
+#define DEBUG(x)        do { if (qla2_extended_error_logging) { x; } } while (0)
 
 #if defined(QL_DEBUG_LEVEL_1)
 #define DEBUG1(x)       do {x;} while (0)
@@ -46,12 +46,12 @@
 #define DEBUG1(x)       do {} while (0)
 #endif
 
-#define DEBUG2(x)       do { if (extended_error_logging) { x; } } while (0)
-#define DEBUG2_3(x)     do { if (extended_error_logging) { x; } } while (0)
-#define DEBUG2_3_11(x)  do { if (extended_error_logging) { x; } } while (0)
-#define DEBUG2_9_10(x)  do { if (extended_error_logging) { x; } } while (0)
-#define DEBUG2_11(x)    do { if (extended_error_logging) { x; } } while (0)
-#define DEBUG2_13(x)    do { if (extended_error_logging) { x; } } while (0)
+#define DEBUG2(x)       do { if (qla2_extended_error_logging) { x; } } while (0)
+#define DEBUG2_3(x)     do { if (qla2_extended_error_logging) { x; } } while (0)
+#define DEBUG2_3_11(x)  do { if (qla2_extended_error_logging) { x; } } while (0)
+#define DEBUG2_9_10(x)  do { if (qla2_extended_error_logging) { x; } } while (0)
+#define DEBUG2_11(x)    do { if (qla2_extended_error_logging) { x; } } while (0)
+#define DEBUG2_13(x)    do { if (qla2_extended_error_logging) { x; } } while (0)
 
 #if defined(QL_DEBUG_LEVEL_3)
 #define DEBUG3(x)       do {x;} while (0)