mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
This commit is contained in:
commit
b7f859dda9
19 changed files with 139 additions and 190 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue