diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-05-13 14:36:11 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-05-13 14:42:23 -0700 |
| commit | f79a917e69e1f5cd86e864b67f06147f1b0340f4 (patch) | |
| tree | 561675103ee8a220365e7c907e51d6c362727ff7 /drivers/soc/qcom/spm.c | |
| parent | ed7cbbce544856b20e5811de373cf92e92499771 (diff) | |
| parent | b853cb9628bfbcc4017da46d5f5b46e3eba9d8c6 (diff) | |
Merge tag 'qcom-soc-for-4.7-2' into net-next
This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/soc/qcom/spm.c')
| -rw-r--r-- | drivers/soc/qcom/spm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c index 5548a31e1a39..f324451e0940 100644 --- a/drivers/soc/qcom/spm.c +++ b/drivers/soc/qcom/spm.c @@ -2,6 +2,8 @@ * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. * Copyright (c) 2014,2015, Linaro Ltd. * + * SAW power controller driver + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and * only version 2 as published by the Free Software Foundation. @@ -12,7 +14,6 @@ * GNU General Public License for more details. */ -#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/io.h> @@ -378,8 +379,5 @@ static struct platform_driver spm_driver = { .of_match_table = spm_match_table, }, }; -module_platform_driver(spm_driver); -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("SAW power controller driver"); -MODULE_ALIAS("platform:saw"); +builtin_platform_driver(spm_driver); |