diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-06 22:02:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:16:52 -0200 |
| commit | d302548a9f88ee417e680ac1e731ef11006b1735 (patch) | |
| tree | c06cdfce1c6ea7d8820e22407e497ec79d0db786 | |
| parent | d026d8284378110c8629a259caaccae4628f1ce0 (diff) | |
V4L/DVB: saa7134-input can't be a module right now
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>
| -rw-r--r-- | drivers/media/video/saa7134/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/media/video/saa7134/Makefile | 11 | ||||
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 5 | ||||
| -rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 2 |
4 files changed, 8 insertions, 17 deletions
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index 892b0b180938..3fe71be41a1f 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig @@ -25,15 +25,12 @@ config VIDEO_SAA7134_ALSA module will be called saa7134-alsa. config VIDEO_SAA7134_RC - tristate "Philips SAA7134 Remote Controller support" + bool "Philips SAA7134 Remote Controller support" depends on VIDEO_IR depends on VIDEO_SAA7134 default y ---help--- - Enables Remote Controller support for saa7134. - - To compile this driver as a module, choose M here: the - module will be called saa7134-rc. + Enables Remote Controller support on saa7134 driver. config VIDEO_SAA7134_DVB tristate "DVB/ATSC Support for saa7134 based TV cards" diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile index 562446800f0e..8a5ff4d3cf15 100644 --- a/drivers/media/video/saa7134/Makefile +++ b/drivers/media/video/saa7134/Makefile @@ -1,9 +1,8 @@ -saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ - saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o \ - saa7134-video.o - -saa7134-rc-objs := saa7134-input.o +saa7134-y := saa7134-cards.o saa7134-core.o saa7134-i2c.o +saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o +saa7134-y += saa7134-video.o +saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.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_RC) += saa7134-rc.o - EXTRA_CFLAGS += -Idrivers/media/video EXTRA_CFLAGS += -Idrivers/media/common/tuners EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index a6ac46211217..3a0ea56f27ff 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c @@ -28,7 +28,7 @@ #include "saa7134-reg.h" #include "saa7134.h" -#define MODULE_NAME "saa7134-rc" +#define MODULE_NAME "saa7134" static unsigned int disable_ir; module_param(disable_ir, int, 0444); @@ -1211,6 +1211,3 @@ static int saa7134_nec_irq(struct saa7134_dev *dev) return 1; } - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>"); diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 99f122b0ce95..d3b6a196e5dc 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h @@ -810,7 +810,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status); /* ----------------------------------------------------------- */ /* 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); void saa7134_input_fini(struct saa7134_dev *dev); void saa7134_input_irq(struct saa7134_dev *dev); |