diff --git a/TODO b/TODO
index bc7ea588..161ecde3 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,24 @@ See TODO in the i2c package.
 KERNEL MODULES
 ==============
 
-* Design a standard /proc interface for chips with automatic fan control
+* 2.4 / 2.5 cleanup
+  See adm1021, lm75, i2c-amd756, and i2c-amd8111 in kernel 2.5.54 for examples
+	- Remove inc_use and dec_use in adapters and chips...
+	  Modules shouldn't adjust their own refcounts.
+	  Do we need to move this elsewhere or just remove?
+	- Convert PCI drivers to use pci_driver structs,
+	  registration, etc.
+	- Use module_init and module_exit
+	- Check return value of request_region(), don't use check_region()
+	- C99 initializers
+	- Remove excess #includes
+	- interrupts/locking
+	- Remove #ifdef MODULE, THIS_MODULE, MODULE_LICENSE, etc.
+	- Remove EXPORT_NO_SYMBOLS
+	- Remove other 2.1/2.2 #ifdefs
+* Handle -1 returns from i2c layer rather than just delivering 0xFF to
+  /proc and libsensors; report errors through /proc 'alarms' or
+  new 'fail' entry?
 * Add string function in sensors.o
 * ALL: cleanup_module is void; check also that cleaning up is done
   properly, now we know that the module will be unloaded whatever we