Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-block.git] / drivers / video / imacfb.c

diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index 6455fd2a39f2d9c333c8892ae93ddc771ff22ef2..9366ef2bb5f7c5748107fa2346daff6d263c9efa 100644 (file)
--- a/drivers/video/imacfb.c
+++ b/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",