Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / include / linux / i2c.h

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index cd2f75b..f1e3ff5 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -353,7 +353,6 @@ struct i2c_algorithm {
  */
 struct i2c_adapter {
        struct module *owner;
-       unsigned int id __deprecated;
        unsigned int class;               /* classes to allow probing for */
        const struct i2c_algorithm *algo; /* the algorithm to access the bus */
        void *algo_data;