diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-09 14:28:02 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-09 14:28:02 -0700 |
commit | 16dfea5d8528f5ae8137306ff9e1d637946696d4 (patch) | |
tree | 69a342d1eff576275a99b69f5d9b3d484f294064 /qlcnic_sysfs.patch | |
parent | e1adefb1daf4ccaa49432aa8ed5db2abe2abb0aa (diff) | |
download | patches-16dfea5d8528f5ae8137306ff9e1d637946696d4.tar.gz |
refresh and remove a patch in Linus's tree
Diffstat (limited to 'qlcnic_sysfs.patch')
-rw-r--r-- | qlcnic_sysfs.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index 1905df3aef1477..a09cec0cc9dd11 100644 --- a/qlcnic_sysfs.patch +++ b/qlcnic_sysfs.patch @@ -91,7 +91,7 @@ static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, -@@ -1155,24 +1156,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w +@@ -1170,24 +1171,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -116,7 +116,7 @@ static struct bin_attribute bin_attr_crb = { .attr = {.name = "crb", .mode = (S_IRUGO | S_IWUSR)}, .size = 0, -@@ -1236,6 +1219,24 @@ static struct bin_attribute bin_attr_fla +@@ -1251,6 +1234,24 @@ static struct bin_attribute bin_attr_fla .write = qlcnic_83xx_sysfs_flash_write_handler, }; @@ -141,7 +141,7 @@ void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1257,6 +1258,11 @@ void qlcnic_remove_sysfs_entries(struct +@@ -1272,6 +1273,11 @@ void qlcnic_remove_sysfs_entries(struct void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; |