diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
| commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
| tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /drivers/pwm/pwm-spear.c | |
| parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
| parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) | |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'drivers/pwm/pwm-spear.c')
| -rw-r--r-- | drivers/pwm/pwm-spear.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c index 8ad26b8bf418..cb2d4f0f9711 100644 --- a/drivers/pwm/pwm-spear.c +++ b/drivers/pwm/pwm-spear.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * ST Microelectronics SPEAr Pulse Width Modulator driver | 2 | * ST Microelectronics SPEAr Pulse Width Modulator driver |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Shiraz Hashim <shiraz.hashim@st.com> | 5 | * Shiraz Hashim <shiraz.linux.kernel@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -264,6 +264,6 @@ static struct platform_driver spear_pwm_driver = { | |||
| 264 | module_platform_driver(spear_pwm_driver); | 264 | module_platform_driver(spear_pwm_driver); |
| 265 | 265 | ||
| 266 | MODULE_LICENSE("GPL"); | 266 | MODULE_LICENSE("GPL"); |
| 267 | MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@st.com>"); | 267 | MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>"); |
| 268 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.com>"); | 268 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.com>"); |
| 269 | MODULE_ALIAS("platform:spear-pwm"); | 269 | MODULE_ALIAS("platform:spear-pwm"); |