diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:24:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:24:11 -0300 |
| commit | e1fbc574390b85339c21945ec238e87018601a08 (patch) | |
| tree | f867f3c77fdd72133e0b5295475e71804039cffe /v4l | |
| parent | dbe2e81959f002660345a0b09161b230df7765cf (diff) | |
| parent | b2dfa0b965563e6fdc3bb36dde59473b97b01a6a (diff) | |
| download | mediapointer-dvb-s2-e1fbc574390b85339c21945ec238e87018601a08.tar.gz mediapointer-dvb-s2-e1fbc574390b85339c21945ec238e87018601a08.tar.bz2 | |
Merge from http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 7d8ae8e8d..98df1af83 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -20,6 +20,8 @@ CONFIG_VIDEO_ALSA := y CONFIG_VIDEO_ADV_DEBUG := y CONFIG_VIDEO_PVRUSB2 := m +CONFIG_VIDEO_PVRUSB2_SYSFS := y +CONFIG_VIDEO_PVRUSB2_DEBUGIFC := y CONFIG_VIDEO_IVTV := n diff --git a/v4l/Makefile b/v4l/Makefile index 0b14488ee..3a26fbdbe 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -224,6 +224,17 @@ $(obj)/av7110_firm.h: $(obj)/fdump EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif +# for pvrusb2 +ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX +endif + ifeq ($(ARCH),) ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ |