commit 50535df3ee3d3407ff61044692942288df7fcd6a
author Boaz Harrosh <bharrosh@panasas.com> Sun Jul 29 22:16:14 2007 +0300
committer James Bottomley <jejb@mulgrave.localdomain> Sat Aug 04 09:11:06 2007 -0500
tree 1e2cc7d596ad07c45ee1c85d5b9f5547932bfd96
parent 03a5743a12b58e10eaa936a02498539db645ba4e

[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>

drivers/scsi/aha152x.h

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 @@
 enum {
   debug_procinfo  = 0x0001,
   debug_queue     = 0x0002,
-  debug_locks     = 0x0004,
+  debug_locking   = 0x0004,
   debug_intr      = 0x0008,
   debug_selection = 0x0010,
   debug_msgo      = 0x0020,