From 78024c12a881a9ba12afbc276fa686252f9bd3a1 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 29 Jul 2012 14:02:45 +0000 Subject: [PATCH] qla2x00t: Fix compilation for the SLES 2.6.32.46 kernel (merge r4099 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4433 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_os.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c index d2a0654be..242cbac64 100644 --- a/qla2x00t/qla_os.c +++ b/qla2x00t/qla_os.c @@ -143,7 +143,7 @@ static int qla2xxx_eh_target_reset(struct scsi_cmnd *); static int qla2xxx_eh_bus_reset(struct scsi_cmnd *); static int qla2xxx_eh_host_reset(struct scsi_cmnd *); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) static int qla2x00_change_queue_depth(struct scsi_device *, int); #else static int qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, @@ -1195,7 +1195,7 @@ qla2xxx_slave_destroy(struct scsi_device *sdev) sdev->hostdata = NULL; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) static int qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth) @@ -1257,7 +1257,7 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) return sdev->queue_depth; } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) */ static int qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)