Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / mfd / htc-pasic3.c

diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c
index f04300e05fd611d79e1c0acaf72bf79df57a44b3..7bc752272dc1db9465132c2731d83afc446bdc85 100644 (file)
--- a/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@ -138,13 +138,6 @@ static int __init pasic3_probe(struct platform_device *pdev)
                irq = r->start;
        }
 
-       r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (r) {
-               ds1wm_resources[1].flags = IORESOURCE_IRQ | (r->flags &
-                       (IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE));
-               irq = r->start;
-       }
-
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!r)
                return -ENXIO;