From: Tony Lindgren <tony@atomide.com>
Date: Tue, 17 Jan 2006 18:25:10 +0000 (-0800)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.16-omap1~130
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c96c66dee8a7b81487135753bc2bfc4ed578d277;p=linux-2.6-omap-h63xx.git

Merge with /home/tmlind/src/kernel/linux-2.6
---

c96c66dee8a7b81487135753bc2bfc4ed578d277
diff --cc include/linux/i2c-id.h
index 2a0ddb0e578,474c8f4f5d4..d1e86965eb7
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@@ -104,9 -104,11 +104,13 @@@
  #define I2C_DRIVERID_AKITAIOEXP	74	/* IO Expander on Sharp SL-C1000 */
  #define I2C_DRIVERID_INFRARED	75	/* I2C InfraRed on Video boards */
  #define I2C_DRIVERID_TVP5150	76	/* TVP5150 video decoder        */
+ #define I2C_DRIVERID_WM8739	77	/* wm8739 audio processor	*/
+ #define I2C_DRIVERID_UPD64083	78	/* upd64083 video processor	*/
+ #define I2C_DRIVERID_UPD64031A	79	/* upd64031a video processor	*/
+ #define I2C_DRIVERID_SAA717X	80	/* saa717x video encoder	*/
  
 +#define I2C_DRIVERID_MISC	99	/* Whatever until sorted out	*/
 +
  #define I2C_DRIVERID_I2CDEV	900
  #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
  #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */