From: Tom Rini <trini@ti.com>
Date: Mon, 1 Dec 2014 20:24:07 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2015.01-rc3~42
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f4e7e2d12164c3235c3f5e19a68a503623029d35;p=oweals%2Fu-boot.git

Merge git://git.denx.de/u-boot-x86
---

f4e7e2d12164c3235c3f5e19a68a503623029d35
diff --cc drivers/video/Makefile
index 7301be3955,000f389b93..00b563f26a
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -39,9 -39,9 +39,10 @@@ obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sand
  obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
  obj-$(CONFIG_VIDEO_SM501) += sm501.o
  obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 +obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o
  obj-$(CONFIG_VIDEO_TEGRA) += tegra.o
  obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
+ obj-$(CONFIG_VIDEO_X86) += x86_fb.o
  obj-$(CONFIG_FORMIKE) += formike.o
  obj-$(CONFIG_AM335X_LCD) += am335x-fb.o
  obj-$(CONFIG_VIDEO_PARADE) += parade.o