Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 477346ff authored Jan 07, 2010 by Dave Airlie Committed by H. Peter Anvin Feb 16, 2010

x86-64: Allow fbdev primary video code



For some reason the 64-bit tree was doing this differently and
I can't see why it would need to.

This correct behaviour when you have two GPUs plugged in and
32-bit put the console in one place and 64-bit in another.

Signed-off-by: Dave Airlie <airlied@redhat.com>
LKML-Reference: <1262847894-27498-1-git-send-email-airlied@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent b0483e78

arch/x86/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -135,9 +135,7 @@ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
		# suspend and hibernation support
		drivers-$(CONFIG_PM) += arch/x86/power/

		ifeq ($(CONFIG_X86_32),y)
		drivers-$(CONFIG_FB) += arch/x86/video/
		endif

		####
		# boot loader support. Several targets are kept for legacy purposes

arch/x86/include/asm/fb.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -12,10 +12,6 @@ static inline void fb_pgprotect(struct file file, struct vm_area_struct vma,
		pgprot_val(vma->vm_page_prot) \|= _PAGE_PCD;
		}

		#ifdef CONFIG_X86_32
		extern int fb_is_primary_device(struct fb_info *info);
		#else
		static inline int fb_is_primary_device(struct fb_info *info) { return 0; }
		#endif

		#endif /* _ASM_X86_FB_H */