diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-12 18:34:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-12 18:34:39 +0000 |
| commit | 2db6be6a7b3edc8a5acea99b817eb7b9e608e931 (patch) | |
| tree | 8a0faae65c8d4eb36d85e60e24bccdf236192d91 /drivers/mailbox | |
| parent | a93f8e76a446e0a146a169cc2cc82bf1e145ad35 (diff) | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| download | talos-obmc-linux-2db6be6a7b3edc8a5acea99b817eb7b9e608e931.tar.gz talos-obmc-linux-2db6be6a7b3edc8a5acea99b817eb7b9e608e931.zip | |
Merge tag 'v3.9-rc2' into asoc-core
Linux 3.9-rc2
Diffstat (limited to 'drivers/mailbox')
| -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; |
