Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114016
b: refs/heads/master
c: 3de2ed1
h: refs/heads/master
v: v3
  • Loading branch information
Dmitri Belimov authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent ba79ebc commit f8a4336
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f689d9083a3a46ae3801c37d0dbcb170fc6a9608
refs/heads/master: 3de2ed127013219efc439c0d052d1cc825da88c2
4 changes: 4 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,10 @@ static int saa7134_hw_enable2(struct saa7134_dev *dev)
irq2_mask |= SAA7134_IRQ2_INTE_GPIO18A;
}

if (dev->has_remote == SAA7134_REMOTE_I2C) {
request_module("ir-kbd-i2c");
}

saa_writel(SAA7134_IRQ1, 0);
saa_writel(SAA7134_IRQ2, irq2_mask);

Expand Down

0 comments on commit f8a4336

Please sign in to comment.