aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 05:16:56 -0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 05:16:56 -0400
commit4ac24f63fd203bc12a841a88a2034dccd358d0d1 (patch)
tree0722f57b9e4c95b5f11909e25826091f2cc4cb89
parentff4395654dc6a3a5e35611940047114d4f3d0a7a (diff)
i386: move video
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/i386/Makefile2
-rw-r--r--arch/x86/video/Makefile (renamed from arch/i386/video/Makefile)0
-rw-r--r--arch/x86/video/fbdev.c (renamed from arch/i386/video/fbdev.c)0
3 files changed, 1 insertions, 1 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/
111# must be linked after kernel/ 111# must be linked after kernel/
112drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ 112drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
113drivers-$(CONFIG_PM) += arch/x86/power/ 113drivers-$(CONFIG_PM) += arch/x86/power/
114drivers-$(CONFIG_FB) += arch/i386/video/ 114drivers-$(CONFIG_FB) += arch/x86/video/
115 115
116CFLAGS += $(mflags-y) 116CFLAGS += $(mflags-y)
117AFLAGS += $(mflags-y) 117AFLAGS += $(mflags-y)
diff --git a/arch/i386/video/Makefile b/arch/x86/video/Makefile
index 2c447c94adcc..2c447c94adcc 100644
--- a/arch/i386/video/Makefile
+++ b/arch/x86/video/Makefile
diff --git a/arch/i386/video/fbdev.c b/arch/x86/video/fbdev.c
index 48fb38d7d2c0..48fb38d7d2c0 100644
--- a/arch/i386/video/fbdev.c
+++ b/arch/x86/video/fbdev.c