diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-03 09:41:16 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-03 09:41:16 -0400 |
| commit | 6f1293ff747ddcb696d546e3efcd31f7cc42b9a5 (patch) | |
| tree | a11d54bb4493dbd40925bf4b2f4dcdf9de64b4d3 /arch/arm/mach-omap2 | |
| parent | b1b12babe3b72cfb08b875245e5a5d7c2747c772 (diff) | |
| parent | f9739d27059d8fd7b64096ea7251608628b5bd30 (diff) | |
Merge back cpufreq material for v3.18.
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 828aee9ea6a8..58920bc8807b 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
| @@ -282,7 +282,7 @@ static inline void omap_init_cpufreq(void) | |||
| 282 | if (!of_have_populated_dt()) | 282 | if (!of_have_populated_dt()) |
| 283 | devinfo.name = "omap-cpufreq"; | 283 | devinfo.name = "omap-cpufreq"; |
| 284 | else | 284 | else |
| 285 | devinfo.name = "cpufreq-cpu0"; | 285 | devinfo.name = "cpufreq-dt"; |
| 286 | platform_device_register_full(&devinfo); | 286 | platform_device_register_full(&devinfo); |
| 287 | } | 287 | } |
| 288 | 288 | ||