kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'powercap' and 'pm-devfreq'

Browse source 
* powercap:
  powercap / RAPL: mark rapl_ids array as __initconst
  powercap / RAPL: add ID for Broadwell server

* pm-devfreq:
  PM / devfreq: tegra: Register governor on module init
  PM / devfreq: tegra: Enable interrupts after resuming the devfreq monitor
  PM / devfreq: tegra: Set drvdata before enabling the irq
  PM / devfreq: tegra: remove operating-points
  PM / devfreq: tegra: Use clock rate constraints
  PM / devfreq: tegra: Update to v5 of the submitted patches
  PM / devfreq: correct misleading comment
  PM / devfreq: event: Add const keyword for devfreq_event_ops structure
This commit is contained in:
Rafael J. Wysocki 2015-04-14 12:53:59 +02:00
commit 518b4e272d
5 changed files with 296 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/devfreq-event.h
View file

@ -91,7 +91,7 @@ struct devfreq_event_desc {
const char *name;
void *driver_data;
struct devfreq_event_ops *ops;
const struct devfreq_event_ops *ops;
};
#if defined(CONFIG_PM_DEVFREQ_EVENT)