diff --git a/[refs] b/[refs] index 9f5edfa1ddc2..3ae5155bf611 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e498be7dafd72fd68848c1eef1575aa7c5d658df +refs/heads/master: a1938038dd7e4188a8663e49242fa77dd2adb7ed diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 16c85c081e6e..077720c2b640 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -22,9 +22,6 @@ config VIDEO_BT848 the Miro, Hauppauge and STB boards. Please read the material in for more information. - If you say Y or M here, you need to say Y or M to "I2C support" and - "I2C bit-banging interfaces" in the device drivers section. - To compile this driver as a module, choose M here: the module will be called bttv.