diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 01:11:03 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 01:11:03 +0100 |
| commit | a7da4813429cf36abd042e6da72cc6641767d52f (patch) | |
| tree | a7552f1e89ae6afb3ebb7051bbac86452a8684f0 /drivers/cpuidle/cpuidle-clps711x.c | |
| parent | Merge branches 'pm-pci' and 'pm-core' (diff) | |
| parent | drivers/cpuidle: make cpuidle-exynos.c explicitly non-modular (diff) | |
| download | linux-dev-a7da4813429cf36abd042e6da72cc6641767d52f.tar.xz linux-dev-a7da4813429cf36abd042e6da72cc6641767d52f.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
drivers/cpuidle: make cpuidle-exynos.c explicitly non-modular
drivers/cpuidle: make cpuidle-ux500.c explicitly non-modular
drivers/cpuidle: make cpuidle-clps711x.c explicitly non-modular
cpuidle,menu: smooth out measured_us calculation
cpuidle,menu: use interactivity_req to disable polling
cpuidle,x86: increase forced cut-off for polling to 20us
Diffstat (limited to 'drivers/cpuidle/cpuidle-clps711x.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-clps711x.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/cpuidle/cpuidle-clps711x.c b/drivers/cpuidle/cpuidle-clps711x.c index 18a7f7380508..66a9f231ec41 100644 --- a/drivers/cpuidle/cpuidle-clps711x.c +++ b/drivers/cpuidle/cpuidle-clps711x.c @@ -12,7 +12,7 @@ #include <linux/cpuidle.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/platform_device.h> #define CLPS711X_CPUIDLE_NAME "clps711x-cpuidle" @@ -56,8 +56,4 @@ static struct platform_driver clps711x_cpuidle_driver = { .name = CLPS711X_CPUIDLE_NAME, }, }; -module_platform_driver_probe(clps711x_cpuidle_driver, clps711x_cpuidle_probe); - -MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>"); -MODULE_DESCRIPTION("CLPS711X CPU idle driver"); -MODULE_LICENSE("GPL"); +builtin_platform_driver_probe(clps711x_cpuidle_driver, clps711x_cpuidle_probe); |