diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 09:02:36 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 09:02:36 -0700 |
commit | 53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (patch) | |
tree | 84b3dda2e2409d1eda7c2273053c78cd6aa3a677 /drivers/input/touchscreen/cyttsp_i2c.c | |
parent | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (diff) | |
parent | ade9c1a47c811a7ae1c874882ad9178af1ed1098 (diff) | |
download | linux-next-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.gz |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/touchscreen/cyttsp_i2c.c')
-rw-r--r-- | drivers/input/touchscreen/cyttsp_i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/cyttsp_i2c.c b/drivers/input/touchscreen/cyttsp_i2c.c index 519e2de2f8df..eee51b3f2e3f 100644 --- a/drivers/input/touchscreen/cyttsp_i2c.c +++ b/drivers/input/touchscreen/cyttsp_i2c.c @@ -86,4 +86,3 @@ module_i2c_driver(cyttsp_i2c_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cypress TrueTouch(R) Standard Product (TTSP) I2C driver"); MODULE_AUTHOR("Cypress"); -MODULE_ALIAS("i2c:cyttsp"); |