mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-18 01:34:14 +08:00
Merge branch 'for-5.10/i2c-hid' into for-linus
- prefer async probing in i2c-hid even if built-in
This commit is contained in:
commit
1341c58615
@ -1268,6 +1268,7 @@ static struct i2c_driver i2c_hid_driver = {
|
||||
.driver = {
|
||||
.name = "i2c_hid",
|
||||
.pm = &i2c_hid_pm,
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
.acpi_match_table = ACPI_PTR(i2c_hid_acpi_match),
|
||||
.of_match_table = of_match_ptr(i2c_hid_of_match),
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user