i386: move video

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 1 insertions, 34 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 4d1c0015e443..397cfedb4b19 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -111,7 +111,7 @@ drivers-$(CONFIG_PCI)			+= arch/x86/pci/
 # must be linked after kernel/
 drivers-$(CONFIG_OPROFILE)              += arch/x86/oprofile/
 drivers-$(CONFIG_PM)                    += arch/x86/power/
-drivers-$(CONFIG_FB)                    += arch/i386/video/
+drivers-$(CONFIG_FB)                    += arch/x86/video/
 
 CFLAGS += $(mflags-y)
 AFLAGS += $(mflags-y)
diff --git a/arch/i386/video/Makefile b/arch/i386/video/Makefile
deleted file mode 100644
index 2c447c94adcc..000000000000
--- a/arch/i386/video/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_FB)               += fbdev.o
diff --git a/arch/i386/video/fbdev.c b/arch/i386/video/fbdev.c
deleted file mode 100644
index 48fb38d7d2c0..000000000000
--- a/arch/i386/video/fbdev.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * arch/i386/video/fbdev.c - i386 Framebuffer
- *
- * 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/pci.h>
-
-int fb_is_primary_device(struct fb_info *info)
-{
-        struct device *device = info->device;
-        struct pci_dev *pci_dev = NULL;
-        struct resource *res = NULL;
-        int retval = 0;
-
-        if (device)
-                pci_dev = to_pci_dev(device);
-
-        if (pci_dev)
-                res = &pci_dev->resource[PCI_ROM_RESOURCE];
-
-        if (res && res->flags & IORESOURCE_ROM_SHADOW)
-                retval = 1;
-
-        return retval;
-}
-EXPORT_SYMBOL(fb_is_primary_device);