aboutsummaryrefslogtreecommitdiffstats
path: root/d05.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-10 15:18:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-10 15:18:10 +0200
commitd330c5b27ba6318556007d16833bd7d3748723dc (patch)
tree348e524486b51845bbc0d961ec7270b50d489955 /d05.patch
parent80110d83f22bdbff0a6973bec911f34eb433c428 (diff)
downloadpatches-d330c5b27ba6318556007d16833bd7d3748723dc.tar.gz
patches refreshed
Diffstat (limited to 'd05.patch')
-rw-r--r--d05.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/d05.patch b/d05.patch
index 133d90e1167d00..4be80f6a799b6e 100644
--- a/d05.patch
+++ b/d05.patch
@@ -22,7 +22,7 @@
{
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -6991,49 +6991,39 @@ static struct pci_driver megasas_pci_dri
+@@ -7323,49 +7323,39 @@ static struct pci_driver megasas_pci_dri
/*
* Sysfs driver attributes
*/
@@ -83,7 +83,7 @@
{
int retval = count;
-@@ -7043,9 +7033,7 @@ megasas_sysfs_set_dbg_lvl(struct device_
+@@ -7375,9 +7365,7 @@ megasas_sysfs_set_dbg_lvl(struct device_
}
return retval;
}
@@ -92,11 +92,11 @@
- megasas_sysfs_set_dbg_lvl);
+static DRIVER_ATTR_RW(dbg_lvl);
- static void
- megasas_aen_polling(struct work_struct *work)
+ static inline void megasas_remove_scsi_device(struct scsi_device *sdev)
+ {
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
-@@ -5664,12 +5664,12 @@ static struct osst_support_data support_
+@@ -5668,12 +5668,12 @@ static struct osst_support_data support_
* sysfs support for osst driver parameter information
*/