git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
drivers
/
mfd
/
htc-pasic3.c
diff --git
a/drivers/mfd/htc-pasic3.c
b/drivers/mfd/htc-pasic3.c
index
f04300e
..
7bc7522
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;
}
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;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r)
return -ENXIO;