diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /drivers/video/omap/sossi.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/video/omap/sossi.c')
| -rw-r--r-- | drivers/video/omap/sossi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index 81dbcf53cf0e..fafd0f26b90f 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
| @@ -646,7 +646,7 @@ static int sossi_init(struct omapfb_device *fbdev) | |||
| 646 | sossi_write_reg(SOSSI_INIT1_REG, l); | 646 | sossi_write_reg(SOSSI_INIT1_REG, l); |
| 647 | 647 | ||
| 648 | if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq, | 648 | if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq, |
| 649 | IRQT_FALLING, | 649 | IRQ_TYPE_EDGE_FALLING, |
| 650 | "sossi_match", sossi.fbdev->dev)) < 0) { | 650 | "sossi_match", sossi.fbdev->dev)) < 0) { |
| 651 | dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n"); | 651 | dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n"); |
| 652 | goto err; | 652 | goto err; |