From 65a6e64bf6742f52a280ba578eaf997549fa0ad7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 28 May 2006 15:45:54 -0300 Subject: Wrong syntax: instead of bool, it was written boolean From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/Kconfig') diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index 344d83aae..ef52e6da0 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -25,7 +25,7 @@ config VIDEO_DEV module will be called videodev. config VIDEO_V4L1 - boolean "Enable Video For Linux API 1 (DEPRECATED)" + bool "Enable Video For Linux API 1 (DEPRECATED)" depends on VIDEO_DEV select VIDEO_V4L1_COMPAT default y @@ -36,7 +36,7 @@ config VIDEO_V4L1 If you are unsure as to whether this is required, answer Y. config VIDEO_V4L1_COMPAT - boolean "Enable Video For Linux API 1 compatible Layer" + bool "Enable Video For Linux API 1 compatible Layer" depends on VIDEO_DEV default y ---help--- -- cgit v1.2.3 From 22ca6fbfdb83215e3e763226f6f15c2e7aec7a16 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 18 Jun 2006 19:40:30 +0200 Subject: Add CX2341X MPEG encoder module. From: Hans Verkuil Adds the cx2341x.c module that handles the programming of the Conexant cx23415/6 MPEG encoder chip used by cx88-blackbird, pvrusb2 and ivtv. Signed-off-by: Hans Verkuil --- linux/drivers/media/Kconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linux/drivers/media/Kconfig') diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index ef52e6da0..583d151b7 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -82,6 +82,9 @@ config VIDEO_IR config VIDEO_TVEEPROM tristate +config VIDEO_CX2341X + tristate + config USB_DABUSB tristate "DABUSB driver" depends on USB -- cgit v1.2.3 From 0a5482d16ed504ebb0bae176713b45d023810514 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 24 Jun 2006 19:47:21 -0400 Subject: make VIDEO_CX2341X a selectable build option From: Michael Krufky The cx2341x mpeg encoder module is used by cx88-blackbird, pvrusb2 and the external ivtv driver. This patch allows for cx2341x to be selected without having to also select cx88-blackbird. This will be needed to build the external ivtv driver or the standalone pvrusb2 driver against kernel 2.6.18 Signed-off-by: Michael Krufky --- linux/drivers/media/Kconfig | 3 --- 1 file changed, 3 deletions(-) (limited to 'linux/drivers/media/Kconfig') diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index 583d151b7..ef52e6da0 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -82,9 +82,6 @@ config VIDEO_IR config VIDEO_TVEEPROM tristate -config VIDEO_CX2341X - tristate - config USB_DABUSB tristate "DABUSB driver" depends on USB -- cgit v1.2.3