diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-26 14:57:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-26 14:57:38 -0300 |
| commit | b450f0966b91226f7a008788f55f7ffb196fd457 (patch) | |
| tree | c2c4abf96a022228639ba3634304458618d0a93c /linux/drivers/media | |
| parent | b0426b9d38d42bfbcf51adbb88581be51dac0b8a (diff) | |
| download | mediapointer-dvb-s2-b450f0966b91226f7a008788f55f7ffb196fd457.tar.gz mediapointer-dvb-s2-b450f0966b91226f7a008788f55f7ffb196fd457.tar.bz2 | |
those kernel-sync didn't merged. Apply manually
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-context.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h | 1 |
2 files changed, 0 insertions, 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 <linux/errno.h> #include <linux/string.h> #include <linux/slab.h> -#include <asm/semaphore.h> #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__ */ - |