diff --git a/[refs] b/[refs]
index b9e375329aed..1014e0904959 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff4395654dc6a3a5e35611940047114d4f3d0a7a
+refs/heads/master: 4ac24f63fd203bc12a841a88a2034dccd358d0d1
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index 4d1c0015e443..397cfedb4b19 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/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/trunk/arch/i386/video/Makefile b/trunk/arch/x86/video/Makefile
similarity index 100%
rename from trunk/arch/i386/video/Makefile
rename to trunk/arch/x86/video/Makefile
diff --git a/trunk/arch/i386/video/fbdev.c b/trunk/arch/x86/video/fbdev.c
similarity index 100%
rename from trunk/arch/i386/video/fbdev.c
rename to trunk/arch/x86/video/fbdev.c