aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/feature-removal-schedule.txt10
-rw-r--r--include/linux/i2c.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7ce623bb9637..895330940f5d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -585,16 +585,6 @@ Who: NeilBrown <neilb@suse.de>
585 585
586---------------------------- 586----------------------------
587 587
588What: i2c_adapter.id
589When: June 2011
590Why: This field is deprecated. I2C device drivers shouldn't change their
591 behavior based on the underlying I2C adapter. Instead, the I2C
592 adapter driver should instantiate the I2C devices and provide the
593 needed platform-specific information.
594Who: Jean Delvare <khali@linux-fr.org>
595
596----------------------------
597
598What: cancel_rearming_delayed_work[queue]() 588What: cancel_rearming_delayed_work[queue]()
599When: 2.6.39 589When: 2.6.39
600 590
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index cd2f75b742ec..f1e3ff5880a9 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -353,7 +353,6 @@ struct i2c_algorithm {
353 */ 353 */
354struct i2c_adapter { 354struct i2c_adapter {
355 struct module *owner; 355 struct module *owner;
356 unsigned int id __deprecated;
357 unsigned int class; /* classes to allow probing for */ 356 unsigned int class; /* classes to allow probing for */
358 const struct i2c_algorithm *algo; /* the algorithm to access the bus */ 357 const struct i2c_algorithm *algo; /* the algorithm to access the bus */
359 void *algo_data; 358 void *algo_data;