diff --git a/[refs] b/[refs] index c8db4ba5d9c1..d8f6b977dda3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2459cf257106cea5adbc83f084b76d0030eb700 +refs/heads/master: 020789e9cb688ac8b15a9950d25fe45492b23398 diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h index af4983b488b6..233c153b12b1 100644 --- a/trunk/include/linux/i2c.h +++ b/trunk/include/linux/i2c.h @@ -219,8 +219,7 @@ struct i2c_algorithm { */ struct i2c_adapter { struct module *owner; - unsigned int id;/* == is algo->id | hwdep.struct->id, */ - /* for registered values see below */ + unsigned int id; unsigned int class; struct i2c_algorithm *algo;/* the algorithm to access the bus */ void *algo_data;