diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/video/s3c2410fb.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (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); |