diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 11:01:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 11:01:02 -0700 |
| commit | 410b42978a241dc4a269d0d75c75d260e6d016e8 (patch) | |
| tree | 82f7e4b3ccddda806b36c84a19a46a221c4c219e /drivers/video/fbdev/efifb.c | |
| parent | e4fba88d00d21f50239eac7d653027bfaf844296 (diff) | |
| parent | ab366b40b8513e7590858229ecbb5e1434a52b54 (diff) | |
| download | op-kernel-dev-410b42978a241dc4a269d0d75c75d260e6d016e8.zip op-kernel-dev-410b42978a241dc4a269d0d75c75d260e6d016e8.tar.gz | |
Merge tag 'fbdev-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen:
- imxfb: fix lcd power up
- small fixes and cleanups
* tag 'fbdev-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
fbdev: Use IS_ENABLED() instead of checking for built-in or module
efifb: Don't show the mapping VA
video: AMBA CLCD: Remove unncessary include in amba-clcd.c
fbdev: ssd1307fb: Fix charge pump setting
Documentation: fb: fix spelling mistakes
fbdev: fbmem: implement error handling in fbmem_init()
fbdev: sh_mipi_dsi: remove driver
video: fbdev: imxfb: add some error handling
video: fbdev: imxfb: fix semantic of .get_power and .set_power
video: fbdev: omap2: Remove deprecated regulator_can_change_voltage() usage
Diffstat (limited to 'drivers/video/fbdev/efifb.c')
| -rw-r--r-- | drivers/video/fbdev/efifb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index f4c045c..924bad4 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -237,10 +237,8 @@ static int efifb_probe(struct platform_device *dev) goto err_release_fb; } - printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, " - "using %dk, total %dk\n", - efifb_fix.smem_start, info->screen_base, - size_remap/1024, size_total/1024); + printk(KERN_INFO "efifb: framebuffer at 0x%lx, using %dk, total %dk\n", + efifb_fix.smem_start, size_remap/1024, size_total/1024); printk(KERN_INFO "efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n", efifb_defined.xres, efifb_defined.yres, efifb_defined.bits_per_pixel, efifb_fix.line_length, |
