diff --git a/[refs] b/[refs]
index 8a97173dd4cc..dec1f4867294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ff982c6911de1484e13a1d765d7bd31a0f8fee
+refs/heads/master: 570aefc361d3315ec6749f573009286106b0b2d8
diff --git a/trunk/include/linux/i2c-isa.h b/trunk/include/linux/i2c-isa.h
index b5727d7702e1..db793b68356c 100644
--- a/trunk/include/linux/i2c-isa.h
+++ b/trunk/include/linux/i2c-isa.h
@@ -26,4 +26,11 @@
 extern int i2c_isa_add_driver(struct i2c_driver *driver);
 extern int i2c_isa_del_driver(struct i2c_driver *driver);
 
+/* Detect whether we are on the isa bus. This is only useful to hybrid
+   (i2c+isa) drivers. */
+#define i2c_is_isa_client(clientptr) \
+        ((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
+#define i2c_is_isa_adapter(adapptr) \
+        ((adapptr)->algo->id == I2C_ALGO_ISA)
+
 #endif /* _LINUX_I2C_ISA_H */
diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h
index 39ff363eadec..da4faa016b17 100644
--- a/trunk/include/linux/i2c.h
+++ b/trunk/include/linux/i2c.h
@@ -580,11 +580,4 @@ union i2c_smbus_data {
 			.force =		force,			\
 		}
 
-/* Detect whether we are on the isa bus. If this returns true, all i2c
-   access will fail! */
-#define i2c_is_isa_client(clientptr) \
-        ((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
-#define i2c_is_isa_adapter(adapptr) \
-        ((adapptr)->algo->id == I2C_ALGO_ISA)
-
 #endif /* _LINUX_I2C_H */