summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-10-11 14:47:25 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-10-11 14:47:25 +0200
commit5a9120439416a9101dec7c7dc65bb75a5ff09c4e (patch)
treef0db772d4b4db863feca1332afca8313ae94b937 /Makefile
parent572886af5984febafa6f083e6b8af0465f4f5764 (diff)
parent4d6c96711bd550ae292df566c2b36ff3e3dac24c (diff)
downloadu-boot-imx-5a9120439416a9101dec7c7dc65bb75a5ff09c4e.zip
u-boot-imx-5a9120439416a9101dec7c7dc65bb75a5ff09c4e.tar.gz
u-boot-imx-5a9120439416a9101dec7c7dc65bb75a5ff09c4e.tar.bz2
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1365db6..7d62f38 100644
--- a/Makefile
+++ b/Makefile
@@ -284,6 +284,7 @@ LIBS-y += drivers/pci/libpci.o
LIBS-y += drivers/pcmcia/libpcmcia.o
LIBS-y += drivers/power/libpower.o \
drivers/power/fuel_gauge/libfuel_gauge.o \
+ drivers/power/mfd/libmfd.o \
drivers/power/pmic/libpmic.o \
drivers/power/battery/libbattery.o
LIBS-y += drivers/spi/libspi.o