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 /drivers/media/video/saa7134/saa7134.h | |
| parent | d026d8284378110c8629a259caaccae4628f1ce0 (diff) | |
| download | linux-d302548a9f88ee417e680ac1e731ef11006b1735.tar.gz linux-d302548a9f88ee417e680ac1e731ef11006b1735.tar.xz | |
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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |