diff options
| author | Boaz Harrosh <bharrosh@panasas.com> | 2007-07-29 15:16:14 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-08-04 10:11:06 -0400 |
| commit | 50535df3ee3d3407ff61044692942288df7fcd6a (patch) | |
| tree | 1e2cc7d596ad07c45ee1c85d5b9f5547932bfd96 /drivers/scsi/aha152x.h | |
| parent | 03a5743a12b58e10eaa936a02498539db645ba4e (diff) | |
[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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aha152x.h b/drivers/scsi/aha152x.h index d2add24d02a3..ac4bfa438bf2 100644 --- a/drivers/scsi/aha152x.h +++ b/drivers/scsi/aha152x.h | |||
| @@ -298,7 +298,7 @@ typedef union { | |||
| 298 | enum { | 298 | enum { |
| 299 | debug_procinfo = 0x0001, | 299 | debug_procinfo = 0x0001, |
| 300 | debug_queue = 0x0002, | 300 | debug_queue = 0x0002, |
| 301 | debug_locks = 0x0004, | 301 | debug_locking = 0x0004, |
| 302 | debug_intr = 0x0008, | 302 | debug_intr = 0x0008, |
| 303 | debug_selection = 0x0010, | 303 | debug_selection = 0x0010, |
| 304 | debug_msgo = 0x0020, | 304 | debug_msgo = 0x0020, |