summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aha152x.h
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2007-07-29 22:16:14 +0300
committerJames Bottomley <jejb@mulgrave.localdomain>2007-08-04 09:11:06 -0500
commit50535df3ee3d3407ff61044692942288df7fcd6a (patch)
tree1e2cc7d596ad07c45ee1c85d5b9f5547932bfd96 /drivers/scsi/aha152x.h
parent03a5743a12b58e10eaa936a02498539db645ba4e (diff)
downloadop-kernel-dev-50535df3ee3d3407ff61044692942288df7fcd6a.zip
op-kernel-dev-50535df3ee3d3407ff61044692942288df7fcd6a.tar.gz
[SCSI] aha152x: fix debug mode symbol conflict
The symbol <debug_locks> conflicts with the rather global one in include/linux/locks.h. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aha152x.h')
-rw-r--r--drivers/scsi/aha152x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aha152x.h b/drivers/scsi/aha152x.h
index d2add24..ac4bfa438b 100644
--- a/drivers/scsi/aha152x.h
+++ b/drivers/scsi/aha152x.h
@@ -298,7 +298,7 @@ typedef union {
enum {
debug_procinfo = 0x0001,
debug_queue = 0x0002,
- debug_locks = 0x0004,
+ debug_locking = 0x0004,
debug_intr = 0x0008,
debug_selection = 0x0010,
debug_msgo = 0x0020,
OpenPOWER on IntegriCloud