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

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/media/video/Makefile
Simple merge

diff --cc include/linux/i2c-id.h
index 2a0ddb0e57845c310a01fc5fc3270e3fdde7f69c,474c8f4f5d4f3a714885f2d71679b5739cae9fc2..d1e86965eb73af270a1bdf3fda5606f58074dad9
--- 1/include/linux/i2c-id.h
--- 2/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  */