| commit | 5e287c52e50b45eab79151e61df054256c2468e4 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Feb 26 11:00:17 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Feb 26 11:00:16 2013 -0800 |
| tree | 0ed602b0d6cf98b6d2a686ec431c9f2ef560b1a1 | |
| parent | 4ce277dba1ff7ed32c5b7403b349d0daff98bcbd [diff] | |
| parent | bd1dac25b5342758c20832224116158ab475e09e [diff] |
Merge "input: synaptics: update license and driver version"
diff --git a/drivers/input/touchscreen/synaptics_fw_update.c b/drivers/input/touchscreen/synaptics_fw_update.c index 98dbad3..7452587 100644 --- a/drivers/input/touchscreen/synaptics_fw_update.c +++ b/drivers/input/touchscreen/synaptics_fw_update.c
@@ -1714,4 +1714,4 @@ MODULE_AUTHOR("Synaptics, Inc."); MODULE_DESCRIPTION("RMI4 FW Update Module"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2");
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi4.h b/drivers/input/touchscreen/synaptics_i2c_rmi4.h index 8d94905..3c37e54 100644 --- a/drivers/input/touchscreen/synaptics_i2c_rmi4.h +++ b/drivers/input/touchscreen/synaptics_i2c_rmi4.h
@@ -23,7 +23,7 @@ #define SYNAPTICS_DS4 (1 << 0) #define SYNAPTICS_DS5 (1 << 1) #define SYNAPTICS_DSX_DRIVER_PRODUCT SYNAPTICS_DS4 -#define SYNAPTICS_DSX_DRIVER_VERSION 0x1001 +#define SYNAPTICS_DSX_DRIVER_VERSION 0x1002 #include <linux/version.h> #ifdef CONFIG_HAS_EARLYSUSPEND
diff --git a/drivers/input/touchscreen/synaptics_rmi_dev.c b/drivers/input/touchscreen/synaptics_rmi_dev.c index 62162a7..7f1aac5 100644 --- a/drivers/input/touchscreen/synaptics_rmi_dev.c +++ b/drivers/input/touchscreen/synaptics_rmi_dev.c
@@ -706,4 +706,4 @@ MODULE_AUTHOR("Synaptics, Inc."); MODULE_DESCRIPTION("RMI4 RMI_Dev Module"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2");