i2c: make i2c_get_adapter prototype clearer

[mv-sheeva.git] / include / linux / i2c.h

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 903576df88dcd6df2b4690991cf88df0b00195f0..c1e70afe2502f6f63b01f70e6860a289325f6e34 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -258,9 +258,7 @@ struct i2c_board_info {
        unsigned short  addr;
        void            *platform_data;
        struct dev_archdata     *archdata;
-#ifdef CONFIG_OF
        struct device_node *of_node;
-#endif
        int             irq;
 };
 
@@ -449,7 +447,7 @@ extern void i2c_release_client(struct i2c_client *client);
 extern void i2c_clients_command(struct i2c_adapter *adap,
                                unsigned int cmd, void *arg);
 
-extern struct i2c_adapter *i2c_get_adapter(int id);
+extern struct i2c_adapter *i2c_get_adapter(int nr);
 extern void i2c_put_adapter(struct i2c_adapter *adap);