aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-08 13:04:41 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 12:47:34 -0400
commitac07bb73fe226ae2088f060c63829afddb3f2403 (patch)
tree6bc41b41535236659b5469ef9fb8261eab8819df /drivers/media/video/em28xx/em28xx.h
parent7aedd5ec87686c557d48584d69ad880c11a0984d (diff)
V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
Currently, the logic to load ir i2c ancillary module is broken. It is associated to Hauppauge devices with IR flag on their eeprom, no matter if the device uses i2c or em28xx direct IR support. That's wrong. Instead, add a flag to the boards that use i2c IR chips and load the module only for those devices and if ir is not disabled. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index bc825bdd65be..0f2ba9a40d17 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -399,6 +399,7 @@ struct em28xx_board {
399 unsigned int has_snapshot_button:1; 399 unsigned int has_snapshot_button:1;
400 unsigned int is_webcam:1; 400 unsigned int is_webcam:1;
401 unsigned int valid:1; 401 unsigned int valid:1;
402 unsigned int has_ir_i2c:1;
402 403
403 unsigned char xclk, i2c_speed; 404 unsigned char xclk, i2c_speed;
404 unsigned char radio_addr; 405 unsigned char radio_addr;