xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Prepare first round of input updates for 4.3 merge window.
This commit is contained in:
Dmitry Torokhov
2015-09-03 10:01:44 -07:00
parent e51e38494a 58f1eae48e
commit 01b944fe1c
16394 changed files with 1454668 additions and 463737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/touchscreen/goodix.c
View File

@@ -420,6 +420,7 @@ static const struct i2c_device_id goodix_ts_id[] = {
{ "GDIX1001:00", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, goodix_ts_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id goodix_acpi_match[] = {
@@ -448,7 +449,6 @@ static struct i2c_driver goodix_ts_driver = {
.id_table = goodix_ts_id,
.driver = {
.name = "Goodix-TS",
.owner = THIS_MODULE,
.acpi_match_table = ACPI_PTR(goodix_acpi_match),
.of_match_table = of_match_ptr(goodix_of_match),
},