diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-28 13:10:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-28 13:10:41 -0300 |
| commit | 7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c (patch) | |
| tree | 5e9e367ef9b0edf36dcca6d6dcb0d67a5f3bea6e /linux/drivers/media/video/pvrusb2 | |
| parent | b56bf8a6147de81da31ee2fde96fe8367386383c (diff) | |
| parent | c0f201cc9dd7be8c8951ecf09e97b783ff10b9b2 (diff) | |
| download | mediapointer-dvb-s2-7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c.tar.gz mediapointer-dvb-s2-7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/woodbury
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig index 4482b2c72..19eb274c9 100644 --- a/linux/drivers/media/video/pvrusb2/Kconfig +++ b/linux/drivers/media/video/pvrusb2/Kconfig @@ -2,8 +2,6 @@ config VIDEO_PVRUSB2 tristate "Hauppauge WinTV-PVR USB2 support" depends on VIDEO_V4L2 && I2C depends on VIDEO_MEDIA # Avoids pvrusb = Y / DVB = M - depends on HOTPLUG # due to FW_LOADER - select FW_LOADER select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c index a317347ad..29d18e867 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c @@ -24,6 +24,7 @@ #else #include <linux/freezer.h> #endif +#include <linux/mm.h> #include "compat.h" #include "dvbdev.h" #include "pvrusb2-debug.h" diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c index fa599a1bf..987e71142 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c @@ -22,6 +22,7 @@ #include "pvrusb2-debug.h" #include <linux/errno.h> #include <linux/string.h> +#include <linux/mm.h> #include <linux/slab.h> #include <linux/mutex.h> #include <asm/uaccess.h> |