x86/gpu change for v2.6.34
Linus,
Please pull the latest x86-gpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-gpu-for-linus
Thanks,
Ingo
------------------>
Dave Airlie (1):
x86-64: Allow fbdev primary video code
arch/x86/Makefile | 2 -- arch/x86/include/asm/fb.h | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-)
arch/x86/Makefile +0 -2
@@ -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
@@ -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 */