diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 16:27:30 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 16:27:30 +0100 |
commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/macintosh/windfarm_rm31.c | |
parent | ARM: 7629/1: mm: Fix missing XN flag for for MT_MEMORY_SO (diff) | |
parent | ARM: virt: simplify __hyp_stub_install epilog (diff) | |
download | linux-210b1847b32951f52d19df229972399e5b987de2.tar.xz linux-210b1847b32951f52d19df229972399e5b987de2.zip |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/macintosh/windfarm_rm31.c')
-rw-r--r-- | drivers/macintosh/windfarm_rm31.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/windfarm_rm31.c b/drivers/macintosh/windfarm_rm31.c index 3eca6d4b52fc..844003fb4ef0 100644 --- a/drivers/macintosh/windfarm_rm31.c +++ b/drivers/macintosh/windfarm_rm31.c @@ -669,7 +669,7 @@ static int wf_rm31_probe(struct platform_device *dev) return 0; } -static int __devexit wf_rm31_remove(struct platform_device *dev) +static int wf_rm31_remove(struct platform_device *dev) { wf_unregister_client(&rm31_events); |