diff options
author | Tom Rini <trini@ti.com> | 2013-04-15 07:45:07 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-04-15 07:45:07 -0400 |
commit | 277f037074fbb73be10a7bff27079b6eb0a3bfbb (patch) | |
tree | fda7a8df71f7ac5b1a4082dd612d3f4cfd17bcf1 /Makefile | |
parent | e303be2d2819699a443b5eece5a04ecc380a9b61 (diff) | |
parent | 8732b0700d21588b4954d0f1b182f4c60725d228 (diff) | |
download | talos-obmc-uboot-277f037074fbb73be10a7bff27079b6eb0a3bfbb.tar.gz talos-obmc-uboot-277f037074fbb73be10a7bff27079b6eb0a3bfbb.zip |
Merge branch 'tpm' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -314,7 +314,7 @@ endif LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/serial/libserial.o LIBS-y += drivers/sound/libsound.o -LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o +LIBS-y += drivers/tpm/libtpm.o LIBS-y += drivers/twserial/libtws.o LIBS-y += drivers/usb/eth/libusb_eth.o LIBS-y += drivers/usb/gadget/libusb_gadget.o |