From 76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:11:12 +0000 Subject: fix-rebase-dust.patch Last rebase to stable-2.6.26 left some trash from rebasing the patches on top of this, clean it back out Signed-off-by: Andy Green --- drivers/mfd/glamo/glamo-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mfd/glamo/glamo-core.c') diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 533f8f38427..d605e2d7cb8 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -1212,7 +1212,7 @@ static int __init glamo_probe(struct platform_device *pdev) if (glamo->pdata->glamo_irq_is_wired && !glamo->pdata->glamo_irq_is_wired()) { set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler); - set_irq_type(glamo->irq, IRQT_FALLING); + set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING); dev_info(&pdev->dev, "Glamo interrupt registered\n"); glamo->irq_works = 1; } else { -- cgit v1.2.3