diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-07 13:25:14 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-07 13:25:14 +1000 |
| commit | b7f859dda95c231a276f2ec915253708f1ca7bdb (patch) | |
| tree | 17d153ebe4cd233afa3680580419f553e79087fc /drivers/video | |
| parent | 428d4d6520a0b8683fe9eac6df3077001e13d00b (diff) | |
| parent | 0eebf9b5d2da61f84cddd0ec2bb41be93f8fc82b (diff) | |
| download | talos-op-linux-b7f859dda95c231a276f2ec915253708f1ca7bdb.tar.gz talos-op-linux-b7f859dda95c231a276f2ec915253708f1ca7bdb.zip | |
Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/controlfb.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/platinumfb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 080fdd2a70f3..8d14b29aafea 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -315,7 +315,7 @@ static int controlfb_blank(int blank_mode, struct fb_info *info) container_of(info, struct fb_info_control, info); unsigned ctrl; - ctrl = ld_le32(CNTRL_REG(p,ctrl)); + ctrl = le32_to_cpup(CNTRL_REG(p,ctrl)); if (blank_mode > 0) switch (blank_mode) { case FB_BLANK_VSYNC_SUSPEND: diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c index 518d1fd38a81..377d3399a3ad 100644 --- a/drivers/video/fbdev/platinumfb.c +++ b/drivers/video/fbdev/platinumfb.c @@ -168,7 +168,7 @@ static int platinumfb_blank(int blank, struct fb_info *fb) struct fb_info_platinum *info = (struct fb_info_platinum *) fb; int ctrl; - ctrl = ld_le32(&info->platinum_regs->ctrl.r) | 0x33; + ctrl = le32_to_cpup(&info->platinum_regs->ctrl.r) | 0x33; if (blank) --blank_mode; if (blank & VESA_VSYNC_SUSPEND) |
