Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[pandora-kernel.git] / drivers / media / video / zoran_driver.c

diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 9711f62..d9a5876 100644 (file)
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -44,7 +44,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/init.h>
 #include <linux/module.h>