diff --git a/[refs] b/[refs] index 23939be3c774..4fb9af8b438b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 950e2fb420d54bf0ee0de2fb0f146827a98330bf +refs/heads/master: 29aaf90c68baccfa2efc81137caa675db450c1da diff --git a/trunk/drivers/media/platform/omap/omap_vout.c b/trunk/drivers/media/platform/omap/omap_vout.c index 7b1afc8585c6..a2cc634eb42e 100644 --- a/trunk/drivers/media/platform/omap/omap_vout.c +++ b/trunk/drivers/media/platform/omap/omap_vout.c @@ -44,7 +44,6 @@ #include #include -#include #include