Commit ce040cd1 authored by Michael Hunold's avatar Michael Hunold Committed by Linus Torvalds

[PATCH] Kconfig and Makefile updates

[V4L] - make sure saa7146 module gets build for Hexium drivers
[V4L] - make Hexium drivers depend on the i2c layer
[DVB] - fix typo which prevented the mt312 driver from being build (obi <=> obj)
parent e558d150
config VIDEO_SAA7146 config VIDEO_SAA7146
tristate tristate
default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
depends on VIDEO_DEV && PCI depends on VIDEO_DEV && PCI && I2C
config VIDEO_VIDEOBUF config VIDEO_VIDEOBUF
tristate tristate
......
...@@ -12,6 +12,6 @@ obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o ...@@ -12,6 +12,6 @@ obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o
obj-$(CONFIG_DVB_CX24110) += cx24110.o obj-$(CONFIG_DVB_CX24110) += cx24110.o
obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o
obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o
obi-$(CONFIG_DVB_MT312) += mt312.o obj-$(CONFIG_DVB_MT312) += mt312.o
obj-$(CONFIG_DVB_VES1820) += ves1820.o obj-$(CONFIG_DVB_VES1820) += ves1820.o
obj-$(CONFIG_DVB_TDA1004X) += tda1004x.o obj-$(CONFIG_DVB_TDA1004X) += tda1004x.o
...@@ -259,7 +259,7 @@ config VIDEO_DPC ...@@ -259,7 +259,7 @@ config VIDEO_DPC
config VIDEO_HEXIUM_ORION config VIDEO_HEXIUM_ORION
tristate "Hexium HV-PCI6 and Orion frame grabber" tristate "Hexium HV-PCI6 and Orion frame grabber"
depends on VIDEO_DEV && PCI depends on VIDEO_DEV && PCI && I2C
---help--- ---help---
This is a video4linux driver for the Hexium HV-PCI6 and This is a video4linux driver for the Hexium HV-PCI6 and
Orion frame grabber cards by Hexium. Orion frame grabber cards by Hexium.
...@@ -271,7 +271,7 @@ config VIDEO_HEXIUM_ORION ...@@ -271,7 +271,7 @@ config VIDEO_HEXIUM_ORION
config VIDEO_HEXIUM_GEMINI config VIDEO_HEXIUM_GEMINI
tristate "Hexium Gemini frame grabber" tristate "Hexium Gemini frame grabber"
depends on VIDEO_DEV && PCI depends on VIDEO_DEV && PCI && I2C
---help--- ---help---
This is a video4linux driver for the Hexium Gemini frame This is a video4linux driver for the Hexium Gemini frame
grabber card by Hexium. Please note that the Gemini Dual grabber card by Hexium. Please note that the Gemini Dual
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment