summaryrefslogtreecommitdiff
path: root/arch/x86/cpu/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-24 12:00:00 -0500
committerTom Rini <trini@ti.com>2014-11-24 12:00:00 -0500
commit746667f1e56bf08d03e66a178df3c4f4f6c806e1 (patch)
treee42c7fd72cb1ef97a5a05a73b06b3cd2fc118147 /arch/x86/cpu/Makefile
parent6c016485a685b5cdac28edb25147311a3e88d51f (diff)
parentfe5b9b447c6eea3873833b1f3ba15c9854aa2ef8 (diff)
downloadu-boot-imx-746667f1e56bf08d03e66a178df3c4f4f6c806e1.zip
u-boot-imx-746667f1e56bf08d03e66a178df3c4f4f6c806e1.tar.gz
u-boot-imx-746667f1e56bf08d03e66a178df3c4f4f6c806e1.tar.bz2
Merge git://git.denx.de/u-boot-x86
Conflicts: arch/x86/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/x86/cpu/Makefile')
-rw-r--r--arch/x86/cpu/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 8dd7b06..2b9e9b9 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
obj-y += interrupts.o cpu.o call64.o
obj-$(CONFIG_SYS_COREBOOT) += coreboot/
+obj-$(CONFIG_PCI) += pci.o