diff options
author | Scott Anderson <saa@android.com> | 2012-03-19 10:33:15 -0700 |
---|---|---|
committer | Scott Anderson <saa@android.com> | 2012-03-19 10:33:15 -0700 |
commit | 7ffaa889ac7e5a0ceab4067f64618704cfb4de39 (patch) | |
tree | 65bf821f96800f79ebf1a02a5b41f6c6e514e8dd /common/Makefile | |
parent | f2641088c260b554f9f1f38cafc15fe42402106b (diff) | |
parent | 43b06888a686ffb00dc37ec94e757f0a63d9791d (diff) | |
download | uboot-7ffaa889ac7e5a0ceab4067f64618704cfb4de39.tar.gz |
Merge branch 'android-master' into android-omap-tungsten
Diffstat (limited to 'common/Makefile')
-rw-r--r-- | common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index ceb8d117c..35e2b7ac5 100644 --- a/common/Makefile +++ b/common/Makefile @@ -127,6 +127,7 @@ COBJS-$(CONFIG_CMD_MII) += cmd_mdio.o endif COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o +COBJS-$(CONFIG_CMD_MMC_SAMSUNG) += cmd_mmc_samsung.o COBJS-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o COBJS-$(CONFIG_MP) += cmd_mp.o COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o |