diff --git a/[refs] b/[refs] index ff54b4cbb15e..e9eed4aa647f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45a5b872bda1a3b5a4959ce66d19381df82419c9 +refs/heads/master: 66c6bda79fdc273608e2700a0c6dd4cb82d0bac3 diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h index bf34c5f4c051..493435bcdbe5 100644 --- a/trunk/include/linux/i2c-id.h +++ b/trunk/include/linux/i2c-id.h @@ -41,7 +41,6 @@ #define I2C_DRIVERID_SAA7110 22 /* video decoder */ #define I2C_DRIVERID_SAA5249 24 /* SAA5249 and compatibles */ #define I2C_DRIVERID_PCF8583 25 /* real time clock */ -#define I2C_DRIVERID_SAB3036 26 /* SAB3036 tuner */ #define I2C_DRIVERID_TDA7432 27 /* Stereo sound processor */ #define I2C_DRIVERID_TVMIXER 28 /* Mixer driver for tv cards */ #define I2C_DRIVERID_TVAUDIO 29 /* Generic TV sound driver */