Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next

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)