Jesse Keating 2f82dd
From cdd54d73203838f249291988d5f79e40fee00a05 Mon Sep 17 00:00:00 2001
Jesse Keating 2f82dd
From: Dave Airlie <airlied@redhat.com>
Jesse Keating 2f82dd
Date: Thu, 7 Jan 2010 16:59:06 +1000
Jesse Keating 2f82dd
Subject: [PATCH] x86: allow fbdev primary video code on 64-bit.
Jesse Keating 2f82dd
Jesse Keating 2f82dd
For some reason the 64-bit tree was doing this differently and
Jesse Keating 2f82dd
I can't see why it would need to.
Jesse Keating 2f82dd
Jesse Keating 2f82dd
This correct behaviour when you have two GPUs plugged in and
Jesse Keating 2f82dd
32-bit put the console in one place and 64-bit in another.
Jesse Keating 2f82dd
Jesse Keating 2f82dd
Signed-off-by: Dave Airlie <airlied@redhat.com>
Jesse Keating 2f82dd
---
Jesse Keating 2f82dd
 arch/x86/Makefile         |    2 --
Jesse Keating 2f82dd
 arch/x86/include/asm/fb.h |    4 ----
Jesse Keating 2f82dd
 2 files changed, 0 insertions(+), 6 deletions(-)
Jesse Keating 2f82dd
Jesse Keating 2f82dd
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
Jesse Keating 2f82dd
index 78b32be..0a43dc5 100644
Jesse Keating 2f82dd
--- a/arch/x86/Makefile
Jesse Keating 2f82dd
+++ b/arch/x86/Makefile
Jesse Keating 2f82dd
@@ -135,9 +135,7 @@ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
Jesse Keating 2f82dd
 # suspend and hibernation support
Jesse Keating 2f82dd
 drivers-$(CONFIG_PM) += arch/x86/power/
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
-ifeq ($(CONFIG_X86_32),y)
Jesse Keating 2f82dd
 drivers-$(CONFIG_FB) += arch/x86/video/
Jesse Keating 2f82dd
-endif
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 ####
Jesse Keating 2f82dd
 # boot loader support. Several targets are kept for legacy purposes
Jesse Keating 2f82dd
diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h
Jesse Keating 2f82dd
index 5301846..2519d06 100644
Jesse Keating 2f82dd
--- a/arch/x86/include/asm/fb.h
Jesse Keating 2f82dd
+++ b/arch/x86/include/asm/fb.h
Jesse Keating 2f82dd
@@ -12,10 +12,6 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
Jesse Keating 2f82dd
 		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
Jesse Keating 2f82dd
 }
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
-#ifdef CONFIG_X86_32
Jesse Keating 2f82dd
 extern int fb_is_primary_device(struct fb_info *info);
Jesse Keating 2f82dd
-#else
Jesse Keating 2f82dd
-static inline int fb_is_primary_device(struct fb_info *info) { return 0; }
Jesse Keating 2f82dd
-#endif
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 #endif /* _ASM_X86_FB_H */
Jesse Keating 2f82dd
-- 
Jesse Keating 2f82dd
1.6.5.2
Jesse Keating 2f82dd