diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 16:31:36 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 16:31:36 +0900 |
| commit | 7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3 (patch) | |
| tree | 5761a78996b2f07f160c7a1e91b3a0f387272c4c /d01.patch | |
| parent | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (diff) | |
| download | patches-7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3.tar.gz | |
remove patches upstream now
Diffstat (limited to 'd01.patch')
| -rw-r--r-- | d01.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/d01.patch b/d01.patch index 47df328d435171..08b009b0f5e722 100644 --- a/d01.patch +++ b/d01.patch @@ -12,7 +12,7 @@ --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1888,7 +1888,7 @@ struct hid_dynid { +@@ -1890,7 +1890,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); -@@ -1920,7 +1920,13 @@ static ssize_t store_new_id(struct devic +@@ -1922,7 +1922,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) { -@@ -2080,6 +2086,7 @@ static int hid_uevent(struct device *dev +@@ -2082,6 +2088,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, -@@ -2526,8 +2533,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); +@@ -2528,8 +2535,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; -@@ -2536,21 +2541,12 @@ int __hid_register_driver(struct hid_dri +@@ -2538,21 +2543,12 @@ int __hid_register_driver(struct hid_dri INIT_LIST_HEAD(&hdrv->dyn_list); spin_lock_init(&hdrv->dyn_lock); |