Merge tag 's390-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / drivers / rtc / rtc-m48t35.c

diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index e8194f1..92f19bf 100644 (file)
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -160,15 +160,10 @@ static int m48t35_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        priv->size = resource_size(res);
-       /*
-        * kludge: remove the #ifndef after ioc3 resource
-        * conflicts are resolved
-        */
-#ifndef CONFIG_SGI_IP27
        if (!devm_request_mem_region(&pdev->dev, res->start, priv->size,
                                     pdev->name))
                return -EBUSY;
-#endif
+
        priv->baseaddr = res->start;
        priv->reg = devm_ioremap(&pdev->dev, priv->baseaddr, priv->size);
        if (!priv->reg)