diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:34:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:34:45 +1000 |
| commit | 41b8bf00e262a505ea3775718c36c91b1572310a (patch) | |
| tree | f4dd152ca111994268a76260ab1497d1b54e16f3 /drivers/clocksource/sh_cmt.c | |
| parent | b0c9d011a903ae3131ecbca71381715415da4a31 (diff) | |
| parent | fa7cd37f808c487f722d7a2ce9c0923a323922df (diff) | |
Merge remote branch 'lost-spurious-irq/lost-spurious-irq'
Conflicts:
drivers/ata/libata-core.c
include/linux/libata.h
Diffstat (limited to 'drivers/clocksource/sh_cmt.c')
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index a44611652282..0a9701b1e13f 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -610,8 +610,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) p->irqaction.name = dev_name(&p->pdev->dev); p->irqaction.handler = sh_cmt_interrupt; p->irqaction.dev_id = p; - p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \ - IRQF_IRQPOLL | IRQF_NOBALANCING; + p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_NOBALANCING; /* get hold of clock */ p->clk = clk_get(&p->pdev->dev, "cmt_fck"); |