From b450f0966b91226f7a008788f55f7ffb196fd457 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 26 Apr 2008 14:57:38 -0300 Subject: those kernel-sync didn't merged. Apply manually From: Mauro Carvalho Chehab kernel-sync: Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/pvrusb2/pvrusb2-context.c | 1 - linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h | 1 - 2 files changed, 2 deletions(-) diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-context.c b/linux/drivers/media/video/pvrusb2/pvrusb2-context.c index 1a2485f5d..60ba6bdb3 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-context.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-context.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "compat.h" static struct pvr2_context *pvr2_context_exist_first; diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h index 04209db87..c13ecfb13 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h @@ -43,4 +43,3 @@ struct pvr2_dvb_props { struct pvr2_dvb_adapter *pvr2_dvb_create(struct pvr2_context *pvr); #endif /* __PVRUSB2_DVB_H__ */ - -- cgit v1.2.3