[SCSI] aha152x: fix debug mode symbol conflict
authorBoaz Harrosh <bharrosh@panasas.com>
Sun, 29 Jul 2007 19:16:14 +0000 (22:16 +0300)
committerJames Bottomley <jejb@mulgrave.localdomain>
Sat, 4 Aug 2007 14:11:06 +0000 (09:11 -0500)
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.c
drivers/scsi/aha152x.h

Simple merge
Simple merge