aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-10-06 21:02:58 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:16:52 -0400
commitd302548a9f88ee417e680ac1e731ef11006b1735 (patch)
treec06cdfce1c6ea7d8820e22407e497ec79d0db786 /drivers/media/video/saa7134/saa7134-input.c
parentd026d8284378110c8629a259caaccae4628f1ce0 (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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index a6ac4621121..3a0ea56f27f 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -28,7 +28,7 @@
28#include "saa7134-reg.h" 28#include "saa7134-reg.h"
29#include "saa7134.h" 29#include "saa7134.h"
30 30
31#define MODULE_NAME "saa7134-rc" 31#define MODULE_NAME "saa7134"
32 32
33static unsigned int disable_ir; 33static unsigned int disable_ir;
34module_param(disable_ir, int, 0444); 34module_param(disable_ir, int, 0444);
@@ -1211,6 +1211,3 @@ static int saa7134_nec_irq(struct saa7134_dev *dev)
1211 1211
1212 return 1; 1212 return 1;
1213} 1213}
1214
1215MODULE_LICENSE("GPL");
1216MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");