Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / include / linux / i2c-id.h

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index b979112..96527f8 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -94,6 +94,8 @@
 #define I2C_DRIVERID_M52790    95      /* Mitsubishi M52790SP/FP AV switch */
 #define I2C_DRIVERID_CS5345    96      /* cs5345 audio processor       */
 
+#define I2C_DRIVERID_MISC      99      /* Whatever until sorted out    */
+
 #define I2C_DRIVERID_I2CDEV    900
 
 #define I2C_DRIVERID_OV7670 1048       /* Omnivision 7670 camera */