Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 14103
b: refs/heads/master
c: 714a095
h: refs/heads/master
i:
  14101: d4cc8bf
  14099: ce7e7a1
  14095: eb3eeae
v: v3
  • Loading branch information
Mauro Carvalho Chehab authored and Linus Torvalds committed Nov 14, 2005
1 parent 9dafb36 commit a57158f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70146cfc84dca917ac27cdc754deae63c1282844
refs/heads/master: 714a095abfa22dfe2accf641118a65796e966a98
7 changes: 7 additions & 0 deletions trunk/drivers/media/video/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,4 +340,11 @@ config VIDEO_AUDIO_DECODER
Say Y here to compile drivers for WM8775 and CS53L32A audio
decoders.

config VIDEO_DECODER
tristate "Add support for additional video chipsets"
depends on VIDEO_DEV && I2C && EXPERIMENTAL
---help---
Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
video decoders.

endmenu
2 changes: 2 additions & 0 deletions trunk/drivers/media/video/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o

obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o

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

EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
6 changes: 6 additions & 0 deletions trunk/drivers/media/video/cx25840/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
cx25840-vbi.o

obj-$(CONFIG_VIDEO_DECODER) += cx25840.o

EXTRA_CFLAGS += -I$(src)/..

0 comments on commit a57158f

Please sign in to comment.