Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[linux-block.git] / arch / x86 / video / fbdev.c

diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c
deleted file mode 100644 (file)
index 1dd6528..0000000
--- a/arch/x86/video/fbdev.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- *
- */
-
-#include <linux/fb.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/vgaarb.h>
-#include <asm/fb.h>
-
-pgprot_t pgprot_framebuffer(pgprot_t prot,
-                           unsigned long vm_start, unsigned long vm_end,
-                           unsigned long offset)
-{
-       pgprot_val(prot) &= ~_PAGE_CACHE_MASK;
-       if (boot_cpu_data.x86 > 3)
-               pgprot_val(prot) |= cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS);
-
-       return prot;
-}
-EXPORT_SYMBOL(pgprot_framebuffer);
-
-int fb_is_primary_device(struct fb_info *info)
-{
-       struct device *device = info->device;
-       struct pci_dev *pci_dev;
-
-       if (!device || !dev_is_pci(device))
-               return 0;
-
-       pci_dev = to_pci_dev(device);
-
-       if (pci_dev == vga_default_device())
-               return 1;
-       return 0;
-}
-EXPORT_SYMBOL(fb_is_primary_device);
-
-MODULE_LICENSE("GPL");