diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/video/s3c2410fb.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/video/s3c2410fb.c')
| -rw-r--r-- | drivers/video/s3c2410fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index ad3bdd6f1ac1..59407343cc73 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
| @@ -614,7 +614,7 @@ static void s3c2410fb_write_palette(struct s3c2410fb_info *fbi) | |||
| 614 | } | 614 | } |
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | static irqreturn_t s3c2410fb_irq(int irq, void *dev_id, struct pt_regs *r) | 617 | static irqreturn_t s3c2410fb_irq(int irq, void *dev_id) |
| 618 | { | 618 | { |
| 619 | struct s3c2410fb_info *fbi = dev_id; | 619 | struct s3c2410fb_info *fbi = dev_id; |
| 620 | unsigned long lcdirq = readl(S3C2410_LCDINTPND); | 620 | unsigned long lcdirq = readl(S3C2410_LCDINTPND); |