Merge branch 'origin' into devel

[linux-2.6-omap-h63xx.git] / drivers / staging / go7007 / wis-i2c.h

diff --git a/drivers/staging/go7007/wis-i2c.h b/drivers/staging/go7007/wis-i2c.h
index 993f658ad731ea0ded26c692c1be028071060150..431f41dd3966f38457b0b7903362cca4445ce419 100644 (file)
--- a/drivers/staging/go7007/wis-i2c.h
+++ b/drivers/staging/go7007/wis-i2c.h
@@ -23,6 +23,7 @@
 #define        I2C_DRIVERID_WIS_SAA7113        0xf0f4
 #define        I2C_DRIVERID_WIS_OV7640         0xf0f5
 #define        I2C_DRIVERID_WIS_TW2804         0xf0f6
+#define        I2C_DRIVERID_S2250              0xf0f7
 #define        I2C_ALGO_GO7007                 0xf00000
 #define        I2C_ALGO_GO7007_USB             0xf10000