diff --git a/[refs] b/[refs] index 828770910a2a..636a64b882cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12429bf9327d41a0692e275bbfce4997f07432f6 +refs/heads/master: db573b241eb1259f749e88f54105d7fa946cb9b2 diff --git a/trunk/drivers/video/imacfb.c b/trunk/drivers/video/imacfb.c index 6455fd2a39f2..9366ef2bb5f7 100644 --- a/trunk/drivers/video/imacfb.c +++ b/trunk/drivers/video/imacfb.c @@ -234,10 +234,6 @@ static int __init imacfb_probe(struct platform_device *dev) size_remap = size_total; imacfb_fix.smem_len = size_remap; -#ifndef __i386__ - screen_info.imacpm_seg = 0; -#endif - if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) { printk(KERN_WARNING "imacfb: cannot reserve video memory at 0x%lx\n",