Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / of / of_i2c.c

diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index 631689171159fd8d590eb5d3d58c8d55d16ccf46..344e1b03dd8b708661fcb08982d27ebd79bd586b 100644 (file)
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -13,6 +13,8 @@
 
 #include <linux/i2c.h>
 #include <linux/of.h>
+#include <linux/of_i2c.h>
+#include <linux/module.h>
 
 struct i2c_driver_device {
        char    *of_device;
@@ -20,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,
@@ -90,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);
@@ -113,3 +112,5 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
        }
 }
 EXPORT_SYMBOL(of_register_i2c_devices);
+
+MODULE_LICENSE("GPL");