diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
commit | 5ec75f810f09a224ce0f77ba312599eb4c7321bc (patch) | |
tree | dcb2b1a0d97363e1a678726925d875c1bea151fa /0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch | |
parent | 11a8f14639c96c38e142ba04c87f50de9c557ba7 (diff) | |
parent | a71ee103a729754519abc15fd58e6b258a89e58b (diff) | |
download | kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.gz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.xz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.zip |
merge origin
Diffstat (limited to '0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch')
-rw-r--r-- | 0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch index 4d7bef554..7804610d1 100644 --- a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch +++ b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch @@ -314,7 +314,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index 7b22366d0065..307a651b2755 100644 +index 8ed37f93f3c8..d7ad35a15acb 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -363,6 +363,7 @@ struct rmi_driver_data { @@ -326,5 +326,5 @@ index 7b22366d0065..307a651b2755 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); -- -2.26.2 +2.28.0 |