Merge branch 'for-rmk/perf' into for-rmk/virt/kvm/core

[deliverable/linux.git] / arch / arm / mach-prima2 / rtciobrg.c

diff --git a/arch/arm/mach-prima2/rtciobrg.c b/arch/arm/mach-prima2/rtciobrg.c
index 9d80f1e20a98fc0364c113ff37df6c8bf5818fac..5573536021302b91f0d52048f14a94b3abfe3513 100644 (file)
--- a/arch/arm/mach-prima2/rtciobrg.c
+++ b/arch/arm/mach-prima2/rtciobrg.c
@@ -107,7 +107,7 @@ static const struct of_device_id rtciobrg_ids[] = {
        {}
 };
 
-static int __devinit sirfsoc_rtciobrg_probe(struct platform_device *op)
+static int sirfsoc_rtciobrg_probe(struct platform_device *op)
 {
        struct device_node *np = op->dev.of_node;