diff --git a/TODO b/TODO
index 32d839ec..f5cacb68 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 Many, many things. Most notably:
 
-* CHeck CDROM insert-remove error of Matt Mueller
+* Check CDROM insert-remove error of Matt Mueller
 * Create wait-queues for bus locking instead of pure semaphores, to make
   it more interactive
 * Check for block read/writes in smbus-on-i2c emulation code
diff --git a/i2c/algo-bit.c b/i2c/algo-bit.c
index 1f04dae7..6ea2b997 100644
--- a/i2c/algo-bit.c
+++ b/i2c/algo-bit.c
@@ -639,8 +639,10 @@ MODULE_PARM_DESC(bit_scan, "Scan for active chips on the bus");
 MODULE_PARM_DESC(i2c_debug,"debug level - 0 off; 1 normal; 2,3 more verbose; 9 bit-protocol");
 
 
+#ifndef LM_SENSORS
 EXPORT_SYMBOL(i2c_bit_add_bus);
 EXPORT_SYMBOL(i2c_bit_del_bus);
+#endif
 
 
 int init_module(void) 
diff --git a/i2c/bit-lp.c b/i2c/bit-lp.c
index 985bf21b..ad812c16 100644
--- a/i2c/bit-lp.c
+++ b/i2c/bit-lp.c
@@ -151,7 +151,9 @@ MODULE_DESCRIPTION("I2C-Bus adapter routines for Philips parallel port adapter")
 
 MODULE_PARM(base, "i");
 
+#ifndef LM_SENSORS
 EXPORT_NO_SYMBOLS;
+#endif
 
 int init_module(void) 
 {
diff --git a/i2c/i2c-core.c b/i2c/i2c-core.c
index 25e9e075..d5fa2367 100644
--- a/i2c/i2c-core.c
+++ b/i2c/i2c-core.c
@@ -453,6 +453,7 @@ MODULE_DESCRIPTION("I2C-Bus main module");
 MODULE_PARM(i2c_debug, "i");
 MODULE_PARM_DESC(i2c_debug,"debug level");
 
+#ifndef LM_SENSORS
 EXPORT_SYMBOL(i2c_add_algorithm);
 EXPORT_SYMBOL(i2c_del_algorithm);
 EXPORT_SYMBOL(i2c_add_adapter);
@@ -466,6 +467,7 @@ EXPORT_SYMBOL(i2c_master_send);
 EXPORT_SYMBOL(i2c_master_recv);
 EXPORT_SYMBOL(i2c_control);
 EXPORT_SYMBOL(i2c_transfer);
+#endif
 
 
 int init_module(void) 
diff --git a/i2c/i2c-dev.c b/i2c/i2c-dev.c
index 5a3adc6f..b92be49f 100644
--- a/i2c/i2c-dev.c
+++ b/i2c/i2c-dev.c
@@ -337,7 +337,9 @@ struct i2c_driver driver = {
 MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
 MODULE_DESCRIPTION("I2C-Bus character device interface");
 
+#ifndef LM_SENSORS
 EXPORT_NO_SYMBOLS;
+#endif
 
 int init_module(void) 
 {