X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmfd%2Fucb1x00-core.c;fp=drivers%2Fmfd%2Fucb1x00-core.c;h=aff83f966803b2f068719d0cc076092d2a2b5c2c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=2bf32721eb5359163074fd861887e77860f4eea7;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 2bf32721e..aff83f966 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -16,6 +16,7 @@
  *  Note that all locks are private to this file.  Nothing else may
  *  touch them.
  */
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -419,10 +420,8 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
 	unsigned long mask;
 
 	mask = probe_irq_on();
-	if (!mask) {
-		probe_irq_off(mask);
+	if (!mask)
 		return NO_IRQ;
-	}
 
 	/*
 	 * Enable the ADC interrupt.
@@ -479,7 +478,7 @@ static int ucb1x00_probe(struct mcp *mcp)
 	mcp_enable(mcp);
 	id = mcp_reg_read(mcp, UCB_ID);
 
-	if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) {
+	if (id != UCB_ID_1200 && id != UCB_ID_1300) {
 		printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
 		goto err_disable;
 	}
@@ -508,7 +507,7 @@ static int ucb1x00_probe(struct mcp *mcp)
 		goto err_free;
 	}
 
-	ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING,
+	ret = request_irq(ucb->irq, ucb1x00_irq, SA_TRIGGER_RISING,
 			  "UCB1x00", ucb);
 	if (ret) {
 		printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",