diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/video/atmel_lcdfb.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/video/atmel_lcdfb.c')
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index d5e801076d33..3d886c6902f9 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
| @@ -964,7 +964,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) | |||
| 964 | if (sinfo->atmel_lcdfb_power_control) | 964 | if (sinfo->atmel_lcdfb_power_control) |
| 965 | sinfo->atmel_lcdfb_power_control(1); | 965 | sinfo->atmel_lcdfb_power_control(1); |
| 966 | 966 | ||
| 967 | dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %lu\n", | 967 | dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n", |
| 968 | info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base); | 968 | info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base); |
| 969 | 969 | ||
| 970 | return 0; | 970 | return 0; |