From 48c6c5d3e358463f401d4a4f227ef7209ef40d65 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 3 Apr 2019 00:49:15 +0000 Subject: [PATCH] qla2x00t-32gbit: Fix a kernel v3.6 compiler warning git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8143 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qla2x00t-32gbit/qla_os.c b/qla2x00t-32gbit/qla_os.c index 0985d5a5c..08d72d2c3 100644 --- a/qla2x00t-32gbit/qla_os.c +++ b/qla2x00t-32gbit/qla_os.c @@ -7273,7 +7273,12 @@ static void qla_pci_reset_notify(struct pci_dev *dev, bool prepare) } #endif -static const struct pci_error_handlers qla2xxx_err_handler = { +static +/* See also commit 494530284f16 ("PCI: Make pci_error_handlers const") # v3.7 */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) || defined(RHEL_MAJOR) +const +#endif +struct pci_error_handlers qla2xxx_err_handler = { .error_detected = qla2xxx_pci_error_detected, .mmio_enabled = qla2xxx_pci_mmio_enabled, .slot_reset = qla2xxx_pci_slot_reset,