diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-19 05:29:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-19 05:29:39 -0700 |
| commit | 0c8cf716fa02d0f6b6ef2ef1446f9f4819fc83dd (patch) | |
| tree | 53dea887c6f88ce205685f01ab8e4c8c32460323 | |
| parent | 82e060812f86dc5407ee2d5a26a2408dc1945f18 (diff) | |
| parent | f5df7526942be9f8a986e615529ce52d4458124e (diff) | |
Merge "msm: vidc: Change module license to GPL v2"
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_v4l2_vidc.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/msm/vidc/vmem/vmem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c index b293eb06ede8..3633d1fb3cd1 100644 --- a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c +++ b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c @@ -782,4 +782,4 @@ static void __exit msm_vidc_exit(void) module_init(msm_vidc_init); module_exit(msm_vidc_exit); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/msm/vidc/vmem/vmem.c b/drivers/media/platform/msm/vidc/vmem/vmem.c index 0f423b1ce17f..e86740fdc5ac 100644 --- a/drivers/media/platform/msm/vidc/vmem/vmem.c +++ b/drivers/media/platform/msm/vidc/vmem/vmem.c @@ -736,4 +736,4 @@ static void __exit vmem_exit(void) module_init(vmem_init); module_exit(vmem_exit); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); |