diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/video/au1200fb.c | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/au1200fb.c')
| -rw-r--r-- | drivers/video/au1200fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index c6a5f0ccc107..dbf4ec3f6d57 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
| @@ -1545,7 +1545,7 @@ static struct fb_ops au1200fb_fb_ops = { | |||
| 1545 | 1545 | ||
| 1546 | /*-------------------------------------------------------------------------*/ | 1546 | /*-------------------------------------------------------------------------*/ |
| 1547 | 1547 | ||
| 1548 | static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id, struct pt_regs *regs) | 1548 | static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id) |
| 1549 | { | 1549 | { |
| 1550 | /* Nothing to do for now, just clear any pending interrupt */ | 1550 | /* Nothing to do for now, just clear any pending interrupt */ |
| 1551 | lcd->intstatus = lcd->intstatus; | 1551 | lcd->intstatus = lcd->intstatus; |