diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-18 14:18:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-18 14:18:54 -0800 |
| commit | d7024eb4ba8db4d684545b3904e983897f5bf335 (patch) | |
| tree | c34d5645fb2c31f82bc0efb78dc25acd93d07ed5 | |
| parent | 32f98f6fc194255e3a639444fe06862e628124c0 (diff) | |
| download | patches-d7024eb4ba8db4d684545b3904e983897f5bf335.tar.gz | |
refresh
| -rw-r--r-- | d01.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/d01.patch b/d01.patch index 36c039d3685019..4ccf58f45b3646 100644 --- a/d01.patch +++ b/d01.patch @@ -12,7 +12,7 @@ --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1890,7 +1890,7 @@ struct hid_dynid { +@@ -1898,7 +1898,7 @@ struct hid_dynid { * Adds a new dynamic hid device ID to this driver, * and causes the driver to probe for all devices again. */ @@ -21,7 +21,7 @@ size_t count) { struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver); -@@ -1922,7 +1922,13 @@ static ssize_t store_new_id(struct devic +@@ -1930,7 +1930,13 @@ static ssize_t store_new_id(struct devic return ret ? : count; } @@ -36,7 +36,7 @@ static void hid_free_dynids(struct hid_driver *hdrv) { -@@ -2082,6 +2088,7 @@ static int hid_uevent(struct device *dev +@@ -2090,6 +2096,7 @@ static int hid_uevent(struct device *dev static struct bus_type hid_bus_type = { .name = "hid", .dev_groups = hid_dev_groups, @@ -44,7 +44,7 @@ .match = hid_bus_match, .probe = hid_device_probe, .remove = hid_device_remove, -@@ -2528,8 +2535,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); +@@ -2527,8 +2534,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); int __hid_register_driver(struct hid_driver *hdrv, struct module *owner, const char *mod_name) { @@ -53,7 +53,7 @@ hdrv->driver.name = hdrv->name; hdrv->driver.bus = &hid_bus_type; hdrv->driver.owner = owner; -@@ -2538,21 +2543,12 @@ int __hid_register_driver(struct hid_dri +@@ -2537,21 +2542,12 @@ int __hid_register_driver(struct hid_dri INIT_LIST_HEAD(&hdrv->dyn_list); spin_lock_init(&hdrv->dyn_lock); @@ -355,7 +355,7 @@ { --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -5376,50 +5376,43 @@ static struct pci_driver megasas_pci_dri +@@ -5371,50 +5371,43 @@ static struct pci_driver megasas_pci_dri /* * Sysfs driver attributes */ @@ -417,7 +417,7 @@ { int retval = count; if(sscanf(buf,"%u",&megasas_dbg_lvl)<1){ -@@ -5429,8 +5422,7 @@ megasas_sysfs_set_dbg_lvl(struct device_ +@@ -5424,8 +5417,7 @@ megasas_sysfs_set_dbg_lvl(struct device_ return retval; } |