Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / media / video / adv7180.c

diff --git a/drivers/media/video/adv7180.c b/drivers/media/video/adv7180.c
index 23e610f6273663b8e46707ed0f31ca6b4f9a5a3f..d2138d06bcad976a931375c1fb0b9b09969d4baa 100644 (file)
--- a/drivers/media/video/adv7180.c
+++ b/drivers/media/video/adv7180.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/slab.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/videodev2.h>