lkml.org 
[lkml]   [2006]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/21] Kconfig: select VIDEO_CX25840 to build cx25840 a/v decoder module
    Date

    From: Michael Krufky <mkrufky@linuxtv.org>
    Date: 1142307307 \-0300

    The cx25840 module requires external firmware in order to function,
    so it must select FW_LOADER, but saa7115 and saa7129 do not require it.
    This patch creates VIDEO_CX25840, and alters VIDEO_DECODER to select it.

    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    ---

    drivers/media/video/Kconfig | 3 +++
    drivers/media/video/Makefile | 3 ++-
    drivers/media/video/cx25840/Kconfig | 9 +++++++++
    drivers/media/video/cx25840/Makefile | 2 +-
    4 files changed, 15 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
    index d82c8a3..995f033 100644
    --- a/drivers/media/video/Kconfig
    +++ b/drivers/media/video/Kconfig
    @@ -349,8 +349,11 @@ config VIDEO_AUDIO_DECODER
    config VIDEO_DECODER
    tristate "Add support for additional video chipsets"
    depends on VIDEO_DEV && I2C && EXPERIMENTAL
    + select VIDEO_CX25840
    ---help---
    Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
    video decoders.

    +source "drivers/media/video/cx25840/Kconfig"
    +
    endmenu
    diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
    index faf7283..d36b145 100644
    --- a/drivers/media/video/Makefile
    +++ b/drivers/media/video/Makefile
    @@ -61,6 +61,7 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom

    obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o

    -obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840/ saa7127.o
    +obj-$(CONFIG_VIDEO_DECODER) += saa7115.o saa7127.o
    +obj-$(CONFIG_VIDEO_CX25840) += cx25840/

    EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
    diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
    new file mode 100644
    index 0000000..854264e
    --- /dev/null
    +++ b/drivers/media/video/cx25840/Kconfig
    @@ -0,0 +1,9 @@
    +config VIDEO_CX25840
    + tristate "Conexant CX2584x audio/video decoders"
    + depends on VIDEO_DEV && I2C && EXPERIMENTAL
    + select FW_LOADER
    + ---help---
    + Support for the Conexant CX2584x audio/video decoders.
    +
    + To compile this driver as a module, choose M here: the
    + module will be called cx25840
    diff --git a/drivers/media/video/cx25840/Makefile b/drivers/media/video/cx25840/Makefile
    index 543ebac..32a896c 100644
    --- a/drivers/media/video/cx25840/Makefile
    +++ b/drivers/media/video/cx25840/Makefile
    @@ -1,6 +1,6 @@
    cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
    cx25840-vbi.o

    -obj-$(CONFIG_VIDEO_DECODER) += cx25840.o
    +obj-$(CONFIG_VIDEO_CX25840) += cx25840.o

    EXTRA_CFLAGS += -I$(src)/..
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-03-17 22:03    [W:0.022 / U:239.520 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site