42a05dcd81
This commit updates the standard kernel to 3.10.0-838 and the rt kernel to 3.10.0-802. Driver updates to ensure compilation also added (Mellanox driver, specifically) Depends-On: https://review.openstack.org/580689 Change-Id: Ie52d7df2f097ea03158b3b3a3334b61833cbdf57 Story: 2002761 Signed-off-by: Jason McKenna <jason.mckenna@windriver.com> Story: 2002761 Task: 22841
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 143c2720aaa898f6e4cd53598808ff1230c33cd8 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <143c2720aaa898f6e4cd53598808ff1230c33cd8.1528226387.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
References: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
|
|
Date: Thu, 18 Feb 2016 13:59:13 +0530
|
|
Subject: [PATCH 30/32] dpt_i2o: fix build warning
|
|
|
|
We were getting build warning about:
|
|
drivers/scsi/dpt_i2o.c:183:29: warning: 'dptids' defined but not used
|
|
|
|
dptids[] is only used in the MODULE_DEVICE_TABLE so when MODULE is not
|
|
defined then dptids[] becomes unused.
|
|
|
|
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
|
|
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
drivers/scsi/dpt_i2o.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
|
|
index 2bce881..cb62223 100644
|
|
--- a/drivers/scsi/dpt_i2o.c
|
|
+++ b/drivers/scsi/dpt_i2o.c
|
|
@@ -180,11 +180,14 @@ static u8 adpt_read_blink_led(adpt_hba* host)
|
|
*============================================================================
|
|
*/
|
|
|
|
+#ifdef MODULE
|
|
static struct pci_device_id dptids[] = {
|
|
{ PCI_DPT_VENDOR_ID, PCI_DPT_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
|
|
{ PCI_DPT_VENDOR_ID, PCI_DPT_RAPTOR_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
|
|
{ 0, }
|
|
};
|
|
+#endif
|
|
+
|
|
MODULE_DEVICE_TABLE(pci,dptids);
|
|
|
|
static int adpt_detect(struct scsi_host_template* sht)
|
|
--
|
|
1.8.3.1
|
|
|