diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-14 11:42:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-14 11:42:47 +1000 |
| commit | a93b0ecffc313a90838f8b989080cf36ddd1769d (patch) | |
| tree | 8cec6a54ee9c0bb0cce4d98820c7aa720fad789b /drivers/mfd/htc-pasic3.c | |
| parent | 84fad6e77eb1cb4cf3c26d8a976d800f80868ccd (diff) | |
| parent | f54db01c717b4fba19fe1fce3e172e5b1daa8f33 (diff) | |
Merge remote branch 'mfd/for-next'
Diffstat (limited to 'drivers/mfd/htc-pasic3.c')
| -rw-r--r-- | drivers/mfd/htc-pasic3.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c index f04300e05fd6..7bc752272dc1 100644 --- 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; |