From f1c80bd9c2797200ffd06d630fe91abbae2fa164 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 10 Dec 2006 21:21:28 +0100 Subject: [PATCH] --- yaml --- r: 44335 b: refs/heads/master c: 36cfb5ccfa39ddd030926d08fcf80ba553c88737 h: refs/heads/master i: 44333: 071c1db1257bcf8f214d7e6f68b108c2e2a0817c 44331: 49e23643c538c8a0caddbe778da9c13d0f15485b 44327: a11cf617592057047b0ddf7eec85535215557f1c 44319: 4cf10ad10642f7d984c8ba94e85f034ab31ea0d7 v: v3 --- [refs] | 2 +- trunk/include/linux/i2c-id.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6fd8152cf5f4..83f21400acbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26f95c4ae2b1fd1b03531b3d662fc21beedce955 +refs/heads/master: 36cfb5ccfa39ddd030926d08fcf80ba553c88737 diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h index 0a8f750cbede..36f0c5b0cbf7 100644 --- a/trunk/include/linux/i2c-id.h +++ b/trunk/include/linux/i2c-id.h @@ -82,9 +82,8 @@ #define I2C_DRIVERID_STM41T00 52 /* real time clock */ #define I2C_DRIVERID_UDA1342 53 /* UDA1342 audio codec */ #define I2C_DRIVERID_ADV7170 54 /* video encoder */ -#define I2C_DRIVERID_RADEON 55 /* I2C bus on Radeon boards */ #define I2C_DRIVERID_MAX1617 56 /* temp sensor */ -#define I2C_DRIVERID_SAA7191 57 /* video encoder */ +#define I2C_DRIVERID_SAA7191 57 /* video decoder */ #define I2C_DRIVERID_INDYCAM 58 /* SGI IndyCam */ #define I2C_DRIVERID_BT832 59 /* CMOS camera video processor */ #define I2C_DRIVERID_TDA9887 60 /* TDA988x IF-PLL demodulator */ @@ -132,7 +131,6 @@ #define I2C_DRIVERID_ADM1021 1008 #define I2C_DRIVERID_ADM9240 1009 #define I2C_DRIVERID_LTC1710 1010 -#define I2C_DRIVERID_ICSPLL 1012 #define I2C_DRIVERID_BT869 1013 #define I2C_DRIVERID_MAXILIFE 1014 #define I2C_DRIVERID_MATORB 1015