d7a297baa6
commit 0181944fe6 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>
56 lines
1.4 KiB
C
56 lines
1.4 KiB
C
/*
|
|
* QLogic iSCSI HBA Driver
|
|
* Copyright (c) 2003-2006 QLogic Corporation
|
|
*
|
|
* See LICENSE.qla4xxx for copyright and licensing details.
|
|
*/
|
|
|
|
/*
|
|
* Driver debug definitions.
|
|
*/
|
|
/* #define QL_DEBUG */ /* DEBUG messages */
|
|
/* #define QL_DEBUG_LEVEL_3 */ /* Output function tracing */
|
|
/* #define QL_DEBUG_LEVEL_4 */
|
|
/* #define QL_DEBUG_LEVEL_5 */
|
|
/* #define QL_DEBUG_LEVEL_9 */
|
|
|
|
#define QL_DEBUG_LEVEL_2 /* ALways enable error messagess */
|
|
#if defined(QL_DEBUG)
|
|
#define DEBUG(x) do {x;} while (0);
|
|
#else
|
|
#define DEBUG(x) do {} while (0);
|
|
#endif
|
|
|
|
#if defined(QL_DEBUG_LEVEL_2)
|
|
#define DEBUG2(x) do {if(qla4_extended_error_logging == 2) x;} while (0);
|
|
#define DEBUG2_3(x) do {x;} while (0);
|
|
#else /* */
|
|
#define DEBUG2(x) do {} while (0);
|
|
#endif /* */
|
|
|
|
#if defined(QL_DEBUG_LEVEL_3)
|
|
#define DEBUG3(x) do {if(qla4_extended_error_logging == 3) x;} while (0);
|
|
#else /* */
|
|
#define DEBUG3(x) do {} while (0);
|
|
#if !defined(QL_DEBUG_LEVEL_2)
|
|
#define DEBUG2_3(x) do {} while (0);
|
|
#endif /* */
|
|
#endif /* */
|
|
#if defined(QL_DEBUG_LEVEL_4)
|
|
#define DEBUG4(x) do {x;} while (0);
|
|
#else /* */
|
|
#define DEBUG4(x) do {} while (0);
|
|
#endif /* */
|
|
|
|
#if defined(QL_DEBUG_LEVEL_5)
|
|
#define DEBUG5(x) do {x;} while (0);
|
|
#else /* */
|
|
#define DEBUG5(x) do {} while (0);
|
|
#endif /* */
|
|
|
|
#if defined(QL_DEBUG_LEVEL_9)
|
|
#define DEBUG9(x) do {x;} while (0);
|
|
#else /* */
|
|
#define DEBUG9(x) do {} while (0);
|
|
#endif /* */
|