initial srpm import

1 files changed, 49 insertions, 0 deletions

diff --git a/linux-2.6-x86-64-fbdev-primary.patch b/linux-2.6-x86-64-fbdev-primary.patch
new file mode 100644
index 0000000..b35096f
--- /dev/null
+++ b/linux-2.6-x86-64-fbdev-primary.patch
@@ -0,0 +1,49 @@
+From cdd54d73203838f249291988d5f79e40fee00a05 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 7 Jan 2010 16:59:06 +1000
+Subject: [PATCH] x86: allow fbdev primary video code on 64-bit.
+
+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>
+---
+ arch/x86/Makefile         |    2 --
+ arch/x86/include/asm/fb.h |    4 ----
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/arch/x86/Makefile b/arch/x86/Makefile
+index 78b32be..0a43dc5 100644
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -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
+diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h
+index 5301846..2519d06 100644
+--- a/arch/x86/include/asm/fb.h
++++ b/arch/x86/include/asm/fb.h
+@@ -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 */
+-- 
+1.6.5.2
+