Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char...

[linux-2.6-microblaze.git] / drivers / hwtracing / coresight / coresight-replicator.c

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
index a73fea9..b86acbc 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-replicator.c
+++ b/drivers/hwtracing/coresight/coresight-replicator.c
@@ -393,9 +393,9 @@ static int dynamic_replicator_probe(struct amba_device *adev,
        return replicator_probe(&adev->dev, &adev->res);
 }
 
-static int dynamic_replicator_remove(struct amba_device *adev)
+static void dynamic_replicator_remove(struct amba_device *adev)
 {
-       return replicator_remove(&adev->dev);
+       replicator_remove(&adev->dev);
 }
 
 static const struct amba_id dynamic_replicator_ids[] = {