Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB: saa7134-input can't be a module right now

Browse source 
There are some symbols at saa7134-input that are used on saa7134
and vice-versa. Due to that, module install fails.

So, partially revert commit 9f495cf7d691c99bf7bdcec9f35fcfdad2cf9ae9.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-10-06 22:02:58 -03:00
parent d026d82843
commit d302548a9f
4 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/video/saa7134/Kconfig
View file

@ -25,15 +25,12 @@ config VIDEO_SAA7134_ALSA
module will be called saa7134-alsa. module will be called saa7134-alsa.
config VIDEO_SAA7134_RC config VIDEO_SAA7134_RC
tristate "Philips SAA7134 Remote Controller support" bool "Philips SAA7134 Remote Controller support"
depends on VIDEO_IR depends on VIDEO_IR
depends on VIDEO_SAA7134 depends on VIDEO_SAA7134
default y default y
---help--- ---help---
Enables Remote Controller support for saa7134. Enables Remote Controller support on saa7134 driver.
To compile this driver as a module, choose M here: the
module will be called saa7134-rc.
config VIDEO_SAA7134_DVB config VIDEO_SAA7134_DVB
tristate "DVB/ATSC Support for saa7134 based TV cards" tristate "DVB/ATSC Support for saa7134 based TV cards"

11
drivers/media/video/saa7134/Makefile
View file

@ -1,9 +1,8 @@
saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ saa7134-y := saa7134-cards.o saa7134-core.o saa7134-i2c.o
saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o \ saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o
saa7134-video.o saa7134-y += saa7134-video.o
saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.o
saa7134-rc-objs := saa7134-input.o
obj-$(CONFIG_VIDEO_SAA7134) += saa6752hs.o saa7134.o saa7134-empress.o obj-$(CONFIG_VIDEO_SAA7134) += saa6752hs.o saa7134.o saa7134-empress.o
@ -11,8 +10,6 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
obj-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-rc.o
EXTRA_CFLAGS += -Idrivers/media/video EXTRA_CFLAGS += -Idrivers/media/video
EXTRA_CFLAGS += -Idrivers/media/common/tuners EXTRA_CFLAGS += -Idrivers/media/common/tuners
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

5
drivers/media/video/saa7134/saa7134-input.c
View file

@ -28,7 +28,7 @@
#include "saa7134-reg.h" #include "saa7134-reg.h"
#include "saa7134.h" #include "saa7134.h"
#define MODULE_NAME "saa7134-rc" #define MODULE_NAME "saa7134"
static unsigned int disable_ir; static unsigned int disable_ir;
module_param(disable_ir, int, 0444); module_param(disable_ir, int, 0444);
@ -1211,6 +1211,3 @@ static int saa7134_nec_irq(struct saa7134_dev *dev)
return 1; return 1;
} }
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");

2
drivers/media/video/saa7134/saa7134.h
View file

@ -810,7 +810,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status);
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* saa7134-input.c */ /* saa7134-input.c */
#if defined(CONFIG_VIDEO_SAA7134_RC) || (defined(CONFIG_VIDEO_SAA7134_RC_MODULE) && defined(MODULE)) #if defined(CONFIG_VIDEO_SAA7134_RC)
int saa7134_input_init1(struct saa7134_dev *dev); int saa7134_input_init1(struct saa7134_dev *dev);
void saa7134_input_fini(struct saa7134_dev *dev); void saa7134_input_fini(struct saa7134_dev *dev);
void saa7134_input_irq(struct saa7134_dev *dev); void saa7134_input_irq(struct saa7134_dev *dev);