diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-06 23:42:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-06 23:42:05 +0100 |
| commit | 6bd51658fae374557b063155bd4465411acd12fc (patch) | |
| tree | c3f4a8e6b350ec1f3aef77502714ac8e1f898e4e /drivers/mailbox/pl320-ipc.c | |
| parent | Merge branch 'acpi-fixes' into fixes (diff) | |
| parent | cpufreq / intel_pstate: Do not load on VM that does not report max P state. (diff) | |
| download | linux-dev-6bd51658fae374557b063155bd4465411acd12fc.tar.xz linux-dev-6bd51658fae374557b063155bd4465411acd12fc.zip | |
Merge branch 'pm-fixes' into fixes
* pm-fixes:
cpufreq / intel_pstate: Do not load on VM that does not report max P state.
cpufreq / intel_pstate: Fix intel_pstate_init() error path
PM / QoS: Remove device PM QoS sysfs attributes at the right place
PM / QoS: Fix concurrency issues and memory leaks in device PM QoS
cpufreq: highbank: do not initialize array with a loop
PM / OPP: improve introductory documentation
cpufreq: Fix a typo in comment
mailbox, pl320-ipc: remove __init from probe function
Diffstat (limited to 'drivers/mailbox/pl320-ipc.c')
| -rw-r--r-- | drivers/mailbox/pl320-ipc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mailbox/pl320-ipc.c b/drivers/mailbox/pl320-ipc.c index c45b3aedafba..d873cbae2fbb 100644 --- a/drivers/mailbox/pl320-ipc.c +++ b/drivers/mailbox/pl320-ipc.c @@ -138,8 +138,7 @@ int pl320_ipc_unregister_notifier(struct notifier_block *nb) } EXPORT_SYMBOL_GPL(pl320_ipc_unregister_notifier); -static int __init pl320_probe(struct amba_device *adev, - const struct amba_id *id) +static int pl320_probe(struct amba_device *adev, const struct amba_id *id) { int ret; |