X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fof%2Fof_i2c.c;h=344e1b03dd8b708661fcb08982d27ebd79bd586b;hb=1ff8419871ea757ae0298aa296bcff9b2ca48561;hp=715a444716177a9dfb4f5cdff90700ca31776ebd;hpb=a217656cb26c5b7ebe9900354b2e808c1f74b470;p=linux-2.6

diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index 715a444716..344e1b03dd 100644
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -13,6 +13,7 @@
 
 #include <linux/i2c.h>
 #include <linux/of.h>
+#include <linux/of_i2c.h>
 #include <linux/module.h>
 
 struct i2c_driver_device {
@@ -21,7 +22,6 @@ struct i2c_driver_device {
 };
 
 static struct i2c_driver_device i2c_devices[] = {
-	{ "dallas,ds1374", "rtc-ds1374" },
 };
 
 static int of_find_i2c_driver(struct device_node *node,
@@ -91,8 +91,6 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
 		}
 
 		info.irq = irq_of_parse_and_map(node, 0);
-		if (info.irq == NO_IRQ)
-			info.irq = -1;
 
 		if (of_find_i2c_driver(node, &info) < 0) {
 			irq_dispose_mapping(info.irq);