linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / i2c / busses / i2c-mpc.c

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 377ab40..5ccd338 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -13,6 +13,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -301,10 +302,6 @@ static int fsl_i2c_probe(struct platform_device *pdev)
        }
 
        i2c->irq = platform_get_irq(pdev, 0);
-       if (i2c->irq < 0) {
-               result = -ENXIO;
-               goto fail_get_irq;
-       }
        i2c->flags = pdata->device_flags;
        init_waitqueue_head(&i2c->queue);
 
@@ -318,7 +315,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
 
        if (i2c->irq != 0)
                if ((result = request_irq(i2c->irq, mpc_i2c_isr,
-                                         IRQF_SHARED, "i2c-mpc", i2c)) < 0) {
+                                         SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
                        printk(KERN_ERR
                               "i2c-mpc - failed to attach interrupt\n");
                        goto fail_irq;
@@ -343,7 +340,6 @@ static int fsl_i2c_probe(struct platform_device *pdev)
       fail_irq:
        iounmap(i2c->base);
       fail_map:
-      fail_get_irq:
        kfree(i2c);
        return result;
 };