diff --git a/[refs] b/[refs] index 08fb32245b5f..16d0b4d45a60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6d6e6dbdfcfc9d56550744068c2a9918798b773 +refs/heads/master: 791b403f5f8b2bb9ecaefc6dacfd4b96cb282274 diff --git a/trunk/drivers/media/video/saa711x.c b/trunk/drivers/media/video/saa711x.c index ed16282fca51..85f3403f7404 100644 --- a/trunk/drivers/media/video/saa711x.c +++ b/trunk/drivers/media/video/saa711x.c @@ -84,6 +84,7 @@ struct saa7113 { }; #define I2C_SAA7113 0x4A +#define I2C_SAA7114 0x42 /* ----------------------------------------------------------------------- */ @@ -465,6 +466,7 @@ saa7113_command (struct i2c_client *client, /* standard i2c insmod options */ static unsigned short normal_i2c[] = { I2C_SAA7113>>1, /* saa7113 */ + I2C_SAA7114>>1, /* saa7114 */ I2C_CLIENT_END };